diff options
| author | Lee Cewd <chasewind_5@hotmail.com> | 2013-09-08 20:49:42 +0800 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2015-04-28 22:09:12 +0200 |
| commit | 242ed444d3803c8e2b35bec07ac1b448caddb541 (patch) | |
| tree | 0a70a16f06e916f7d49d442490207deb53e04f72 | |
| parent | d80678dc5545df8c5b36a265eb73f8c40ca54b5d (diff) | |
| download | libraw1394-242ed444d3803c8e2b35bec07ac1b448caddb541.tar.gz | |
Fix memory leak in response handler
A temporarily allocated buffer which is used to pass data from libraw1394's
event loop to the Address Range Mapping callback was never freed.
This was pointed out by the following valgrind trace:
3067120 (3066560 direct, 560 indirect) bytes in 10952 blocks are definitely lost in loss record 36 of 36
at 0x4029F6F : malloc ()
by 0x405B1B5 : ??? (in usr/lib/libraw1394.so.11.0.1)
by 0x405B492 : ??? (in usr/lib/libraw1394.so.11.0.1)
by 0x405BF24 : fw_loop_iterate (in usr/lib/libraw1394.so.11.0.1)
by 0x405C197 : ??? (in usr/lib/libraw1394.so.11.0.1)
by 0x405D6F8 : fw_write (in usr/lib/libraw1394.so.11.0.1)
by 0x405A292 : raw1394_write (in usr/lib/libraw1394.so.11.0.1)
by 0x805A0F2 : main (main.cpp:121)
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | src/fw.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -793,7 +793,7 @@ handle_arm_request(raw1394handle_t handle, struct address_closure *ac, struct fw_cdev_send_response response; arm_options_t type; size_t in_length; - int pos; + int pos, retval; pos = offset - allocation->offset; response.handle = kernel_handle; @@ -898,8 +898,10 @@ handle_arm_request(raw1394handle_t handle, struct address_closure *ac, rrb->response.buffer = rrb->data + in_length; memcpy(rrb->response.buffer, allocation->data + pos, response.length); - return fwhandle->arm_tag_handler(handle, allocation->tag, type, - length, &rrb->request_response); + retval = fwhandle->arm_tag_handler(handle, allocation->tag, type, + length, &rrb->request_response); + free(rrb); + return retval; } int |