[arch-commits] Commit in wine-staging/trunk (PKGBUILD gdi32-heap-corruption.patch)

[Felix Yan]

    Date: Friday, October 23, 2015 @ 10:34:51
  Author: fyan
Revision: 144774

upgpkg: wine-staging 1.7.53-2

add a patch to fix FS#46819, suggested by upstream

Added:
  wine-staging/trunk/gdi32-heap-corruption.patch
Modified:
  wine-staging/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   10 +++++++---
 gdi32-heap-corruption.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-23 08:30:38 UTC (rev 144773)
+++ PKGBUILD	2015-10-23 08:34:51 UTC (rev 144774)
@@ -7,14 +7,15 @@
 
 pkgname=wine-staging
 pkgver=1.7.53
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=("https://github.com/wine-compholio/wine-patched/archive/staging-$pkgver.tar.gz"
-        30-win32-aliases.conf)
+        30-win32-aliases.conf gdi32-heap-corruption.patch)
 sha1sums=('07889b58bda0755f53310a19bb6a8e62c704658f'
-          '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+          '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+          'f02a126e46db4283440caf04d618af39747bd284')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
 url="http://www.wine-staging.com"
@@ -107,6 +108,9 @@
 prepare() {
   cd wine-patched-staging-$pkgver
 
+  # FS#46819
+  patch -p1 -i ../gdi32-heap-corruption.patch
+
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
 }
 

Added: gdi32-heap-corruption.patch
===================================================================
--- gdi32-heap-corruption.patch	                        (rev 0)
+++ gdi32-heap-corruption.patch	2015-10-23 08:34:51 UTC (rev 144774)
@@ -0,0 +1,28 @@
+From d774442e8d65dc8ef1ad3d9a677fd0da623ff174 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry at baikal.ru>
+Date: Tue, 20 Oct 2015 12:25:54 +0800
+Subject: [PATCH] gdi32: Fix heap corruption.
+
+Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
+Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
+Signed-off-by: Alexandre Julliard <julliard at winehq.org>
+---
+ dlls/gdi32/freetype.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
+index 95df22a..9f2a9fb 100644
+--- a/dlls/gdi32/freetype.c
++++ b/dlls/gdi32/freetype.c
+@@ -5189,7 +5189,7 @@ static void fill_fileinfo_from_face( GdiFont *font, Face *face )
+         strcpyW(font->fileinfo->path, face->file);
+     }
+     else
+-        memset(&font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR));
++        memset(font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR));
+ }
+ 
+ /*************************************************************
+-- 
+1.9.1
+