[PATCH 2/2] wpcap: Fix crash on pcap_loop(try 4)
Jianqiu Zhang
zhangjianqiu_133 at yeah.net
Sun Feb 14 08:24:15 CST 2016
From 0c79601fbf19f047cda820db747b5eeda3b93c83 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 | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c
index b3bb6a5..36896b5 100644
--- a/dlls/wpcap/wpcap.c
+++ b/dlls/wpcap/wpcap.c
@@ -98,7 +98,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");
}
@@ -110,11 +109,12 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt,
if (callback)
{
- PCAP_HANDLER_CALLBACK *pcb;
- 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);
+ int res;
+ PCAP_HANDLER_CALLBACK pcb;
+ pcb.pfn_cb = callback;
+ pcb.user_data = user;
+ res = pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)&pcb);
+ return res;
}
return pcap_dispatch(p, cnt, NULL, user);
@@ -203,11 +203,12 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt,
if (callback)
{
- PCAP_HANDLER_CALLBACK *pcb;
- 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);
+ int res;
+ PCAP_HANDLER_CALLBACK pcb;
+ pcb.pfn_cb = callback;
+ pcb.user_data = user;
+ res = pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)&pcb);
+ return res;
}
return pcap_loop(p, cnt, NULL, user);
--
2.7.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20160214/6fccb442/attachment.html>
More information about the wine-patches
mailing list