[GNUnet-SVN] r24261 - in Extractor: . src/plugins

[gnunet]

Author: grothoff
Date: 2012-10-11 09:20:37 +0200 (Thu, 11 Oct 2012)
New Revision: 24261

Modified:
   Extractor/ChangeLog
   Extractor/src/plugins/archive_extractor.c
Log:
bratao: fix for #2586, crash of archive_extractor on opening lnk-files

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2012-10-11 04:50:02 UTC (rev 24260)
+++ Extractor/ChangeLog 2012-10-11 07:20:37 UTC (rev 24261)
@@ -1,3 +1,6 @@
+Thu Oct 11 09:19:42 CEST 2012
+       Fixing archive-plugin crash on ".lnk" files (#2586). -bratao
+
 Tue Oct  9 22:28:50 CEST 2012
        Fixing use-after-free in plugin IPC if plugin crashes
        while no seek is pending. -CG

Modified: Extractor/src/plugins/archive_extractor.c
===================================================================
--- Extractor/src/plugins/archive_extractor.c   2012-10-11 04:50:02 UTC (rev 
24260)
+++ Extractor/src/plugins/archive_extractor.c   2012-10-11 07:20:37 UTC (rev 
24261)
@@ -101,7 +101,9 @@
   a = archive_read_new ();
   archive_read_support_compression_all (a);
   archive_read_support_format_all (a);
-  archive_read_open2 (a, ec, NULL, &read_cb, &skip_cb, NULL);
+  if(archive_read_open2 (a, ec, NULL, &read_cb, &skip_cb, NULL)!= ARCHIVE_OK)
+       return;
+       
   while (ARCHIVE_OK == archive_read_next_header(a, &entry))
     {
       if ( (NULL == format) &&