summaryrefslogtreecommitdiff
path: root/camlibs/iclick
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-01-06 13:16:27 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-01-06 13:16:27 +0000
commit7ad7f6b9157861b38377ea0d0c6c80cf1f611967 (patch)
treee243958195bd5cac4ed6eb77410f7838f8914365 /camlibs/iclick
parent8287d3639aac78758383d13816a3f488f271fe70 (diff)
downloadlibgphoto2-7ad7f6b9157861b38377ea0d0c6c80cf1f611967.tar.gz
restructured realloc logic (Coverity)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14658 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/iclick')
-rw-r--r--camlibs/iclick/iclick.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/camlibs/iclick/iclick.c b/camlibs/iclick/iclick.c
index 78412e183..3de9c4415 100644
--- a/camlibs/iclick/iclick.c
+++ b/camlibs/iclick/iclick.c
@@ -87,13 +87,14 @@ icl_init (GPPort *port, CameraPrivateLibrary *priv)
for (i=0; i< (0x8000 - 64) && catalog[i+64] ; i+=32)
;
priv->nb_entries = i>>5;
- catalog_tmp = realloc(catalog, i);
if (i) {
+ catalog_tmp = realloc(catalog, i);
if (catalog_tmp)
priv->catalog = catalog_tmp;
else
priv->catalog = catalog;
} else {
+ free(catalog);
priv->catalog = NULL; /* We just have freed catalog_tmp */
}