[PATCH 2/2] wpcap: Fix crash on pcap_loop

[Jianqiu Zhang]

From 064be8949c53e43ba56a586d30d2186e5da8cb06 Mon Sep 17 00:00:00 2001
From: Jianqiu Zhang <zhangjianqiu_133 at yeah.net>
Date: Tue, 5 Jan 2016 09:12:42 +0800
Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop

Signed-off-by: Jianqiu Zhang <zhangjianqiu_133 at yeah.net>
---
 dlls/wpcap/wpcap.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index da911c7..0c725a4 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -95,7 +95,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h
     TRACE("(%p %p %p)\n", user_data, h, p);
     pcb = (PCAP_HANDLER_CALLBACK *)user_data;
     pcb->pfn_cb(pcb->user_data, h, p);
-    HeapFree(GetProcessHeap(), 0, pcb);
     TRACE("Callback COMPLETED\n");
 }
 
@@ -103,6 +102,7 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,
                              void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *),
                              unsigned char *user)
 {
+    int res = 0;
     TRACE("(%p %i %p %p)\n", p, cnt, callback, user);
 
     if (callback)
@@ -111,7 +111,9 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,
         pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK));
         pcb->pfn_cb = callback;
         pcb->user_data = user;
-        return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb);
+        res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)pcb);
+        HeapFree(GetProcessHeap(), 0, pcb);
+        return res;
     }
 
     return pcap_dispatch(p, cnt, NULL, user);
@@ -196,6 +198,7 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,
                          void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *),
                          unsigned char *user)
 {
+    int res = 0;
     TRACE("(%p %i %p %p)\n", p, cnt, callback, user);
 
     if (callback)
@@ -204,7 +207,9 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,
         pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK));
         pcb->pfn_cb = callback;
         pcb->user_data = user;
-        return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb);
+        res =  pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)pcb);
+        HeapFree(GetProcessHeap(), 0, pcb);
+        return res;
     }
 
     return pcap_loop(p, cnt, NULL, user);
-- 
2.6.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20160107/92bdfa95/attachment-0001.html>