From 89ec17dbeacc3bc88c45171eb6c8a55e1da42f5d Mon Sep 17 00:00:00 2001 From: Hubert Figuiere Date: Wed, 9 May 2007 01:12:28 +0000 Subject: [PATCH] fix deadcode and leak. (CID 4) (CID 53) git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10142 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/kodak/dc3200/library.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/camlibs/kodak/dc3200/library.c b/camlibs/kodak/dc3200/library.c index 385ce250e..a5173b067 100644 --- a/camlibs/kodak/dc3200/library.c +++ b/camlibs/kodak/dc3200/library.c @@ -666,7 +666,7 @@ int dc3200_recv_packet(Camera *camera, unsigned char *data, int *data_len) res = gp_port_read(camera->port, &buff[num_read], 1); - while(res > 0 && fails < READ_RETRIES) { + while(res >= 0 && fails < READ_RETRIES) { if(res == 0) { /* read nothing */ fails++; @@ -846,6 +846,7 @@ int dc3200_process_packet(Camera *camera, unsigned char *data, int *data_len) /* make sure its a valid packet */ if(length != count - 3 || checksum != dc3200_calc_checksum(camera, data, count - 2)) { printf("%02x=%02x %02x=%02x\n", length, count - 3, checksum, dc3200_calc_checksum(camera, data, count - 2)); + free(buff); return GP_ERROR; }