2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b9e9ce..c1a730a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Sun Oct 15 19:36:41 CEST 2017
-        Fix potential file descriptor leak (on error handling path). -CG
+        Fix potential file descriptor leak (on error handling path).
+        Fix potential assign-after-free (on IPC error handling path). -CG
 
 Fri Oct 13 12:30:37 CEST 2017
         Properly check read error in NSF plugin (from signedness confusion) found by Leon Zhao. -CG
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
index e08bb61..146fd49 100644
--- a/src/main/extractor_ipc_gnu.c
+++ b/src/main/extractor_ipc_gnu.c
@@ -545,6 +545,7 @@ EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
               LOG_STRERROR ("realloc");
               EXTRACTOR_IPC_channel_destroy_ (channel);
               channels[i] = NULL;
+              continue;
             }
           channel->mdata = ndata;
         }
@@ -563,6 +564,7 @@ EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
                channel->plugin->libname);
           EXTRACTOR_IPC_channel_destroy_ (channel);
           channels[i] = NULL;
+          continue;
         }
       else
         {