diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 56770fe36..b08df41f8 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -942,6 +942,7 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list, "initial message too short (%i < minimum %i)", dirents_length, CANON_MINIMUM_DIRENT_SIZE); free (dirent_data); + dirent_data = NULL; return GP_ERROR; } @@ -962,6 +963,7 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list, "Reached end of packet while " "examining the first dirent"); free (dirent_data); + dirent_data = NULL; return GP_ERROR; } pos++; /* skip NULL byte terminating directory name */ @@ -1026,6 +1028,7 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list, "canon_int_list_dir: " "truncated directory entry encountered"); free (dirent_data); + dirent_data = NULL; return GP_ERROR; } @@ -1166,6 +1169,7 @@ canon_int_list_directory (Camera *camera, const char *folder, CameraList *list, pos += dirent_ent_size; } free (dirent_data); + dirent_data = NULL; GP_DEBUG (""); gp_filesystem_dump (camera->fs); @@ -1335,6 +1339,7 @@ canon_int_get_thumbnail (Camera *camera, const char *name, unsigned char **retda if (res != GP_OK) { GP_DEBUG ("canon_int_get_thumbnail: couldn't extract thumbnail data"); free (data); + data = NULL; return res; } GP_DEBUG ("canon_int_get_thumbnail: extracted thumbnail data"); @@ -1513,6 +1518,8 @@ old_canon_int_get_thumbnail (Camera *camera, const char *name, int *length) } free (data); + data = NULL; + return NULL; } #endif diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index 9045c1cfb..983875c0c 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -982,6 +982,7 @@ canon_serial_get_file (Camera *camera, const char *name, int *length, GPContext msg = canon_serial_recv_msg (camera, 0x1, 0x21, &len, context); } free (file); + file = NULL; return NULL; } @@ -1046,6 +1047,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data, gp_context_error (context, "canon_serial_get_dirents: " "Failed to read another directory entry"); free (data); + data = NULL; return GP_ERROR; } @@ -1061,6 +1063,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data, gp_context_error (context, "canon_serial_get_dirents: " "Truncated directory entry received"); free (data); + data = NULL; return GP_ERROR; } @@ -1086,6 +1089,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data, gp_context_error (context, "canon_serial_get_dirents: " "Too many dirents, we must be looping."); free (data); + data = NULL; return GP_ERROR; } @@ -1096,6 +1100,7 @@ canon_serial_get_dirents (Camera *camera, unsigned char **dirent_data, "Could not resize dirent buffer " "to %i bytes", mallocd_bytes); free (data); + data = NULL; return GP_ERROR; } data = temp_ch; diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 52bc6e5ef..2d845e311 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -597,6 +597,7 @@ canon_usb_long_dialogue (Camera *camera, int canon_funct, unsigned char **data, "gp_port_read() returned error (%i) or no data\n", bytes_read); free (*data); + *data = NULL; /* here, it is an error to get 0 bytes from gp_port_read() * too, but 0 is GP_OK so if bytes_read is 0 return GP_ERROR_CORRUPTED_DATA