libextractor

commit d63bb2248479a7275ca24621534147f8bb498be2
parent bf455e7a04d001fdf1c098e49fc8b282faf0bf87
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun,  9 Dec 2012 15:43:58 +0000

trying to fix 2686

Diffstat:
M
src/common/Makefile.am
 | 
8
++++++--
M
src/main/extractor_ipc_gnu.c
 | 
5
+++++
M
src/plugins/Makefile.am
 | 
3
+--

3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -7,6 +7,10 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIB = -lgcov
 endif
+if HAVE_ZLIB
+  zlib = -lz
+  LINK_UNZIP = unzip.c unzip.h
+endif
 
 lib_LTLIBRARIES = \
   libextractor_common.la
@@ -16,9 +20,9 @@ libextractor_common_la_LDFLAGS = \
   -version-info 1:0:0
 
 libextractor_common_la_LIBADD = \
-  $(LTLIBICONV) -lz
+  $(LTLIBICONV) $(zlib)
 
 libextractor_common_la_SOURCES = \
   le_architecture.h \
-  unzip.c unzip.h \
+  $(LINK_UNZIP) \
   convert.c convert.h 
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
@@ -292,6 +292,7 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
   if (0 != pipe (p1))
     {
       LOG_STRERROR ("pipe");
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -300,6 +301,7 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
       LOG_STRERROR ("pipe");
       (void) close (p1[0]);
       (void) close (p1[1]);
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -311,6 +313,7 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
       (void) close (p1[1]);
       (void) close (p2[0]);
       (void) close (p2[1]);
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -318,6 +321,8 @@ EXTRACTOR_IPC_channel_create_ (struct EXTRACTOR_PluginList *plugin,
     {
       (void) close (p1[1]);
       (void) close (p2[0]);
+      free (channel->mdata);
+      free (channel);
       EXTRACTOR_plugin_main_ (plugin, p1[0], p2[1]);
       _exit (0);
     }
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -156,7 +156,7 @@ TEST_OGG=test_ogg
 endif
 
 if HAVE_ZLIB
-PLUGIN_ZLIB=libextractor_deb.la
+PLUGIN_ZLIB=libextractor_deb.la libextractor_zip.la
 TEST_ZLIB=test_deb
 endif
 
@@ -175,7 +175,6 @@ plugin_LTLIBRARIES = \
   libextractor_sid.la \
   libextractor_wav.la \
   libextractor_xm.la \
-  libextractor_zip.la \
   $(PLUGIN_ARCHIVE) \
   $(PLUGIN_EXIV2) \
   $(PLUGIN_FFMPEG) \