From 12ecf0983d9355e3f1b4781645503cb4fb65e599 Mon Sep 17 00:00:00 2001<br>From: Jianqiu Zhang <zhangjianqiu_133@yeah.net><br>Date: Tue, 5 Jan 2016 09:12:42 +0800<br>Subject: [PATCH 2/2] wpcap: Fix crash on pcap_loop<br><br>Signed-off-by: Jianqiu Zhang <zhangjianqiu_133@yeah.net><br>---<br> dlls/wpcap/wpcap.c | 11 ++++++++---<br> 1 file changed, 8 insertions(+), 3 deletions(-)<br><br>diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c<br>index 074c495..926d2d7 100644<br>--- a/dlls/wpcap/wpcap.c<br>+++ b/dlls/wpcap/wpcap.c<br>@@ -97,7 +97,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h<br>     TRACE("(%p %p %p)\n", user_data, h, p);<br>     pcb = (PCAP_HANDLER_CALLBACK *)user_data;<br>     pcb->pfn_cb(pcb->user_data, h, p);<br>-    HeapFree(GetProcessHeap(), 0, pcb);<br>     TRACE("Callback COMPLETED\n");<br> }<br> <br>@@ -109,11 +108,14 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,<br> <br>     if (callback)<br>     {<br>+        int res;<br>         PCAP_HANDLER_CALLBACK *pcb;<br>         pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK));<br>         pcb->pfn_cb = callback;<br>         pcb->user_data = user;<br>-        return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb);<br>+        res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)pcb);<br>+        HeapFree(GetProcessHeap(), 0, pcb);<br>+        return res;<br>     }<br> <br>     return pcap_dispatch(p, cnt, NULL, user);<br>@@ -202,11 +204,14 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,<br> <br>     if (callback)<br>     {<br>+        int res;<br>         PCAP_HANDLER_CALLBACK *pcb;<br>         pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK));<br>         pcb->pfn_cb = callback;<br>         pcb->user_data = user;<br>-        return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb);<br>+        res = pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)pcb);<br>+        HeapFree(GetProcessHeap(), 0, pcb);<br>+        return res;<br>     }<br> <br>     return pcap_loop(p, cnt, NULL, user);<br>-- <br>2.7.1<br>