Messages in this thread | | | Subject | Re: [PATCH] tools: ffs-aio-example: free memory upon failure | From | Robert Baldyga <> | Date | Wed, 18 Nov 2015 10:46:01 +0100 |
| |
Hi Wei,
On 11/18/2015 07:13 AM, Wei, Jiangang wrote: > To whom it may concern: > > Sorry to bother again, > But any comment about this patch? >
Reviewed-by: Robert Baldyga <r.baldyga@samsung.com>
It looks good to me. By the way, maybe we should also close file descriptors in error path?
Thanks, Robert Baldyga
> On Mon, 2015-11-09 at 14:16 +0800, Wei Jiangang wrote: >> Free buffer to avoid memory leak upon failure occurs. >> >> Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com> >> --- >> tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c | 4 ++++ >> tools/usb/ffs-aio-example/simple/device_app/aio_simple.c | 4 ++++ >> 2 files changed, 8 insertions(+) >> >> diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c >> index aaca1f44e788..3eb1a92baacf 100644 >> --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c >> +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c >> @@ -263,20 +263,24 @@ int main(int argc, char *argv[]) >> sprintf(ep_path, "%s/ep0", argv[1]); >> ep0 = open(ep_path, O_RDWR); >> if (ep0 < 0) { >> + free(ep_path); >> perror("unable to open ep0"); >> return 1; >> } >> if (write(ep0, &descriptors, sizeof(descriptors)) < 0) { >> + free(ep_path); >> perror("unable do write descriptors"); >> return 1; >> } >> if (write(ep0, &strings, sizeof(strings)) < 0) { >> + free(ep_path); >> perror("unable to write strings"); >> return 1; >> } >> sprintf(ep_path, "%s/ep1", argv[1]); >> ep1 = open(ep_path, O_RDWR); >> if (ep1 < 0) { >> + free(ep_path); >> perror("unable to open ep1"); >> return 1; >> } >> diff --git a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c >> index 1f44a29818bf..ac96892ca5d2 100644 >> --- a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c >> +++ b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c >> @@ -234,14 +234,17 @@ int main(int argc, char *argv[]) >> sprintf(ep_path, "%s/ep0", argv[1]); >> ep0 = open(ep_path, O_RDWR); >> if (ep0 < 0) { >> + free(ep_path); >> perror("unable to open ep0"); >> return 1; >> } >> if (write(ep0, &descriptors, sizeof(descriptors)) < 0) { >> + free(ep_path); >> perror("unable do write descriptors"); >> return 1; >> } >> if (write(ep0, &strings, sizeof(strings)) < 0) { >> + free(ep_path); >> perror("unable to write strings"); >> return 1; >> } >> @@ -249,6 +252,7 @@ int main(int argc, char *argv[]) >> sprintf(ep_path, "%s/ep%d", argv[1], i+1); >> ep[i] = open(ep_path, O_RDWR); >> if (ep[i] < 0) { >> + free(ep_path); >> printf("unable to open ep%d: %s\n", i+1, >> strerror(errno)); >> return 1; >
| |