summaryrefslogtreecommitdiff
path: root/camlibs
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2022-10-12 20:37:13 +0200
committerMarcus Meissner <marcus@jet.franken.de>2022-10-12 20:37:13 +0200
commit0aea074ab604203c4b0a1e27c7ba2fef9428ea1a (patch)
tree1f566990308be6026ff80bdfc1a73d6449ed0c4f /camlibs
parentd2e3fef8e08ce77ef6a5115a5d7b01be4f8b5e36 (diff)
downloadlibgphoto2-0aea074ab604203c4b0a1e27c7ba2fef9428ea1a.tar.gz
free storedevents after use
Diffstat (limited to 'camlibs')
-rw-r--r--camlibs/ptp2/library.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index a0b0aea77..285de6755 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -4129,6 +4129,7 @@ camera_nikon_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pa
GP_LOG_D ("saving event queue before capture: event.Code is %x / param %lx", event.Code, (unsigned long)event.Param1);
ptp_add_event_queue (&storedevents, &nrstoredevents, &event);
}
+ free(storedevents); storedevents = NULL;
if (ptp_operation_issupported(params, PTP_OC_NIKON_InitiateCaptureRecInMedia)) {
@@ -4171,6 +4172,7 @@ capturetriggered:
/* store back all the queued events back to the hw event queue before returning. */
/* we do not do this in all error edge cases currently, only the ones that can trigger often */
ptp_add_events (params, storedevents, nrstoredevents);
+ free(storedevents); storedevents = NULL;
C_PTP_REP (ret);
}
@@ -4252,6 +4254,7 @@ capturetriggered:
/* add all the queued events back to the event queue */
ptp_add_events (params, storedevents, nrstoredevents);
+ free(storedevents); storedevents = NULL;
/* Maximum image time is 30 seconds, but NR processing might take 25 seconds ... so wait longer.
* see https://github.com/gphoto/libgphoto2/issues/94 */