Added patch to fix memory leak in wininet.HTTP_InsertCookies.

This commit is contained in:
Sebastian Lackner 2015-05-15 20:01:15 +02:00
parent dcfee86e79
commit 90bf076dfc
3 changed files with 42 additions and 1 deletions

1
debian/changelog vendored
View File

@ -33,6 +33,7 @@ wine-staging (1.7.43) UNRELEASED; urgency=low
* Added patch to implement kernel32.GetSystemTimePreciseAsFileTime.
* Added patch with tests for
imagehlp.{ImageLoad,ImageUnload,GetImageUnusedHeaderBytes}.
* Added patch to fix memory leak in wininet.HTTP_InsertCookies.
* Removed patch to use lockfree implementation for FD cache (accepted
upstream).
* Removed patch to properly handle closing sockets during a select call

View File

@ -55,7 +55,7 @@ version()
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
echo " commit 14c53a58632f89a4d3a6ae449f339806b4c094a0"
echo " commit 566077a2cdb7ea6ee17eedc1b1f8395c02643633"
echo ""
}
@ -276,6 +276,7 @@ patch_enable_all ()
enable_winex11_Window_Style="$1"
enable_winex11_XEMBED="$1"
enable_winex11_wglShareLists="$1"
enable_wininet_Memory_Leak="$1"
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
enable_winmm_Delay_Import_Depends="$1"
enable_winsta_WinStationEnumerateW="$1"
@ -895,6 +896,9 @@ patch_enable ()
winex11-wglShareLists)
enable_winex11_wglShareLists="$2"
;;
wininet-Memory_Leak)
enable_wininet_Memory_Leak="$2"
;;
wininet-ParseX509EncodedCertificateForListBoxEntry)
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$2"
;;
@ -5492,6 +5496,18 @@ if test "$enable_winex11_wglShareLists" -eq 1; then
) >> "$patchlist"
fi
# Patchset wininet-Memory_Leak
# |
# | Modified files:
# | * dlls/wininet/http.c
# |
if test "$enable_wininet_Memory_Leak" -eq 1; then
patch_apply wininet-Memory_Leak/0001-wininet-Fix-memory-leak-by-not-calling-get_cookie_he.patch
(
echo '+ { "Michael Müller", "wininet: Fix memory leak by not calling get_cookie_header twice.", 1 },';
) >> "$patchlist"
fi
# Patchset wininet-ParseX509EncodedCertificateForListBoxEntry
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,24 @@
From ea90cf45cda5a343daa2b50332bb956a8db12388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 May 2015 19:55:13 +0200
Subject: wininet: Fix memory leak by not calling get_cookie_header twice.
---
dlls/wininet/http.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index cd2cdcf..45183cf 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -4244,7 +4244,6 @@ static void HTTP_InsertCookies(http_request_t *request)
if(res != ERROR_SUCCESS || !cookies)
return;
- get_cookie_header(request->server->name, request->path, &cookies);
HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE);
heap_free(cookies);
}
--
2.4.0