diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-21 10:07:55 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-05-21 10:07:55 -0700 |
| commit | 6cd488e95a658b23cf503febd9c5201837d45ec7 (patch) | |
| tree | d7c0485adb8c6108aadc40685d81b5cb40ff18bb /toolbox/ioctl.c | |
| parent | f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469 (diff) | |
| parent | faf845290bb78824502d007209134c8dbfa296a2 (diff) | |
| download | system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.zip system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.tar.gz system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.tar.bz2 | |
resolved conflicts for merge of faf84529 to master
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
Diffstat (limited to 'toolbox/ioctl.c')
| -rw-r--r-- | toolbox/ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/toolbox/ioctl.c b/toolbox/ioctl.c index fd24885..fd90812 100644 --- a/toolbox/ioctl.c +++ b/toolbox/ioctl.c @@ -21,9 +21,9 @@ int ioctl_main(int argc, char *argv[]) int arg_size = 4; int direct_arg = 0; uint32_t ioctl_nr; - void *ioctl_args; + void *ioctl_args = NULL; uint8_t *ioctl_argp; - uint8_t *ioctl_argp_save; + uint8_t *ioctl_argp_save = NULL; int rem; do { @@ -116,6 +116,7 @@ int ioctl_main(int argc, char *argv[]) else res = ioctl(fd, ioctl_nr, 0); if (res < 0) { + free(ioctl_args); fprintf(stderr, "ioctl 0x%x failed, %d\n", ioctl_nr, res); return 1; } @@ -128,5 +129,6 @@ int ioctl_main(int argc, char *argv[]) } printf("\n"); } + free(ioctl_args); return 0; } |