wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to avoid dereferencing NULL pointer for fonts without VDMX.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-07-12 03:38:31 +02:00
parent 65c559753a
commit b5c7642a3e
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -8,6 +8,7 @@ wine-staging (1.7.47) UNRELEASED; urgency=low
* Added patch to use GLX_MESA_query_renderer extension to get more exact GPU
infos.
* Added initial set of patches for multithreaded vcomp implementation.
* Added patch to avoid dereferencing NULL pointer for fonts without VDMX.
* Removed patch to implement kernel32.GetNumaProcessorNode (accepted
upstream).
* Removed patch to initialize *end with NULL on failure in msvcrt.strtod

25
patches/dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch Normal file
View File

@ -0,0 +1,25 @@
From ef42bee07f37038aa690ddf8c164c7fff8512a25 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 12 Jul 2015 03:36:20 +0200
Subject: dwrite: Avoid dereferencing NULL pointer for fonts without VDMX.
---
dlls/dwrite/opentype.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 63e1b74..8d90c04 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1347,7 +1347,7 @@ static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr)
BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 *descent)
{
const struct VDMX_Header *hdr = (const struct VDMX_Header*)data;
- const struct VDMX_group *group = find_vdmx_group(hdr);
+ const struct VDMX_group *group;
const struct VDMX_vTable *tables;
WORD recs, i;
--
2.4.5

16
patches/patchinstall.sh
View File

@ -112,6 +112,7 @@ patch_enable_all ()
enable_dinput_Events="$1"
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dwrite_VDMX="$1"
enable_dxgi_GetDesc="$1"
enable_dxva2_Video_Decoder="$1"
enable_fltmgr_Stub_SYS="$1"
@ -412,6 +413,9 @@ patch_enable ()
dsound-Fast_Mixer)
enable_dsound_Fast_Mixer="$2"
;;
dwrite-VDMX)
enable_dwrite_VDMX="$2"
;;
dxgi-GetDesc)
enable_dxgi_GetDesc="$2"
;;
@ -2576,6 +2580,18 @@ if test "$enable_dsound_EAX" -eq 1; then
) >> "$patchlist"
fi
# Patchset dwrite-VDMX
# |
# | Modified files:
# | * dlls/dwrite/opentype.c
# |
if test "$enable_dwrite_VDMX" -eq 1; then
patch_apply dwrite-VDMX/0001-dwrite-Avoid-dereferencing-NULL-pointer-for-fonts-wi.patch
(
echo '+ { "Sebastian Lackner", "dwrite: Avoid dereferencing NULL pointer for fonts without VDMX.", 1 },';
) >> "$patchlist"
fi
# Patchset dxgi-GetDesc
# |
# | This patchset fixes the following Wine bugs: