[GNUnet-SVN] r25334 - in Extractor/src: common main plugins

[gnunet]

Author: grothoff
Date: 2012-12-09 16:43:58 +0100 (Sun, 09 Dec 2012)
New Revision: 25334

Modified:
   Extractor/src/common/Makefile.am
   Extractor/src/main/extractor_ipc_gnu.c
   Extractor/src/plugins/Makefile.am
Log:
trying to fix 2686

Modified: Extractor/src/common/Makefile.am
===================================================================
--- Extractor/src/common/Makefile.am    2012-12-09 15:38:55 UTC (rev 25333)
+++ Extractor/src/common/Makefile.am    2012-12-09 15:43:58 UTC (rev 25334)
@@ -7,6 +7,10 @@
   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 @@
   -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 

Modified: Extractor/src/main/extractor_ipc_gnu.c
===================================================================
--- Extractor/src/main/extractor_ipc_gnu.c      2012-12-09 15:38:55 UTC (rev 
25333)
+++ Extractor/src/main/extractor_ipc_gnu.c      2012-12-09 15:43:58 UTC (rev 
25334)
@@ -292,6 +292,7 @@
   if (0 != pipe (p1))
     {
       LOG_STRERROR ("pipe");
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -300,6 +301,7 @@
       LOG_STRERROR ("pipe");
       (void) close (p1[0]);
       (void) close (p1[1]);
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -311,6 +313,7 @@
       (void) close (p1[1]);
       (void) close (p2[0]);
       (void) close (p2[1]);
+      free (channel->mdata);
       free (channel);
       return NULL;
     }
@@ -318,6 +321,8 @@
     {
       (void) close (p1[1]);
       (void) close (p2[0]);
+      free (channel->mdata);
+      free (channel);
       EXTRACTOR_plugin_main_ (plugin, p1[0], p2[1]);
       _exit (0);
     }

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2012-12-09 15:38:55 UTC (rev 25333)
+++ Extractor/src/plugins/Makefile.am   2012-12-09 15:43:58 UTC (rev 25334)
@@ -156,7 +156,7 @@
 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 @@
   libextractor_sid.la \
   libextractor_wav.la \
   libextractor_xm.la \
-  libextractor_zip.la \
   $(PLUGIN_ARCHIVE) \
   $(PLUGIN_EXIV2) \
   $(PLUGIN_FFMPEG) \