wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix NULL dereference in ICSeqCompressFrameStart.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-01-07 10:51:59 +01:00
parent 2e6bd2290e
commit 673cb4f847
5 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/msvfw32-Image_Size/0001-msvfw32-Derive-image-size-from-input-image-to-avoid-.patch Normal file
View File

@@ -0,0 +1,26 @@
From 0e2ab70965e4b50319e7e0a50ce9ee88c1425ecc Mon Sep 17 00:00:00 2001
From: Bruno Jesus <00cpxxx@gmail.com>
Date: Wed, 7 Jan 2015 10:50:03 +0100
Subject: msvfw32: Derive image size from input image to avoid NULL
dereference.
---
dlls/msvfw32/msvideo_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index b6b7507..82b732b 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -1447,7 +1447,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn)
}
pc->cbState = sizeof(ICCOMPRESS);
- pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage);
+ pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage);
if (!pc->lpBitsOut)
{
HeapFree(GetProcessHeap(), 0, pc->lpbiIn);
--
2.2.1

1
patches/msvfw32-Image_Size/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [27595] Fix NULL dereference in ICSeqCompressFrameStart

19
patches/patchinstall.sh
View File

@@ -102,6 +102,7 @@ patch_enable_all ()
enable_makedep_PARENTSPEC="$1"
enable_msvcp90_basic_string_wchar_dtor="$1"
enable_msvcrt_atof_strtod="$1"
enable_msvfw32_Image_Size="$1"
enable_ntdll_DOS_Attributes="$1"
enable_ntdll_DVD_Read_Size="$1"
enable_ntdll_DllRedirects="$1"
@@ -336,6 +337,9 @@ patch_enable ()
msvcrt-atof_strtod)
enable_msvcrt_atof_strtod="$2"
;;
msvfw32-Image_Size)
enable_msvfw32_Image_Size="$2"
;;
ntdll-DOS_Attributes)
enable_ntdll_DOS_Attributes="$2"
;;
@@ -1622,6 +1626,21 @@ if [ "$enable_msvcrt_atof_strtod" -eq 1 ]; then
) >> "$patchlist"
fi
# Patchset msvfw32-Image_Size
# |
# | This patchset fixes the following Wine bugs:
# | * [#27595] Fix NULL dereference in ICSeqCompressFrameStart
# |
# | Modified files:
# | * dlls/msvfw32/msvideo_main.c
# |
if [ "$enable_msvfw32_Image_Size" -eq 1 ]; then
patch_apply msvfw32-Image_Size/0001-msvfw32-Derive-image-size-from-input-image-to-avoid-.patch
(
echo '+ { "Bruno Jesus", "msvfw32: Derive image size from input image to avoid NULL dereference.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-DOS_Attributes
# |
# | This patchset fixes the following Wine bugs: