diff -Nru wine1.6-1.6.2/debian/changelog wine1.6-1.6.2/debian/changelog --- wine1.6-1.6.2/debian/changelog 2015-05-26 10:55:38.000000000 +0000 +++ wine1.6-1.6.2/debian/changelog 2015-07-15 19:15:14.000000000 +0000 @@ -1,3 +1,10 @@ +wine1.6 (1:1.6.2-0ubuntu10) wily; urgency=medium + + * cherry pick deb274226783ab886bdb44876944e156757efe2b to + make msiexec work again (LP: #1383214) + + -- Michael Vogt Wed, 15 Jul 2015 21:14:40 +0200 + wine1.6 (1:1.6.2-0ubuntu9) wily; urgency=medium * No-change rebuild against libgphoto2-port12. diff -Nru wine1.6-1.6.2/debian/patches/0041-cherry-pick-deb2742267.patch wine1.6-1.6.2/debian/patches/0041-cherry-pick-deb2742267.patch --- wine1.6-1.6.2/debian/patches/0041-cherry-pick-deb2742267.patch 1970-01-01 00:00:00.000000000 +0000 +++ wine1.6-1.6.2/debian/patches/0041-cherry-pick-deb2742267.patch 2015-07-15 19:14:03.000000000 +0000 @@ -0,0 +1,56 @@ +From 6e0c62b61398d87c1034e83d7d9550e1098105da Mon Sep 17 00:00:00 2001 +From: André Hentschel +Date: Sun, 01 Mar 2015 19:29:18 +0000 +Subject: wine: Add patch to fix miscompilation with gcc 4.9 + +Signed-off-by: André Hentschel +Signed-off-by: Thomas Petazzoni +--- +diff --git a/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch b/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch +new file mode 100644 +index 0000000..f6d5a9d +--- /dev/null ++++ b/package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch +@@ -0,0 +1,40 @@ ++commit deb274226783ab886bdb44876944e156757efe2b ++Author: Daniel Beitler ++Date: Sun May 18 13:27:42 2014 -0400 ++ ++ msi: Prevent call to memset with a null pointer ++ in get_tablecolumns function. ++ ++Fix miscompilation with gcc >= 4.9 ++See https://bugs.winehq.org/show_bug.cgi?id=36139 for the upstream ++bug report. There won't be a Wine 1.6.3 so we need to address this ++anyway. ++ ++Backported from: deb274226783ab886bdb44876944e156757efe2b ++Signed-off-by: André Hentschel ++--- ++ dlls/msi/table.c | 4 ++-- ++ 1 file changed, 2 insertions(+), 2 deletions(-) ++ ++diff --git a/dlls/msi/table.c b/dlls/msi/table.c ++index 8012369..9ed9421 100644 ++--- a/dlls/msi/table.c +++++ b/dlls/msi/table.c ++@@ -671,7 +671,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF ++ /* Note: _Columns table doesn't have non-persistent data */ ++ ++ /* if maxcount is non-zero, assume it's exactly right for this table */ ++- memset( colinfo, 0, maxcount * sizeof(*colinfo) ); +++ if (colinfo) memset( colinfo, 0, maxcount * sizeof(*colinfo) ); ++ count = table->row_count; ++ for (i = 0; i < count; i++) ++ { ++@@ -684,7 +684,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF ++ /* check the column number is in range */ ++ if (col < 1 || col > maxcount) ++ { ++- ERR("column %d out of range\n", col); +++ ERR("column %d out of range (maxcount: %d)\n", col, maxcount); ++ continue; ++ } ++ /* check if this column was already set */ +-- +cgit v0.9.1 diff -Nru wine1.6-1.6.2/debian/patches/series wine1.6-1.6.2/debian/patches/series --- wine1.6-1.6.2/debian/patches/series 2014-10-06 23:53:15.000000000 +0000 +++ wine1.6-1.6.2/debian/patches/series 2015-07-15 19:14:12.000000000 +0000 @@ -40,3 +40,4 @@ 0038-winepulse-use-a-pi-mutex-for-serialization.patch 0039-winepulse-add-support-for-IMarshal.patch 0040-Revert-winmm-Increase-mmdevapi-buffer-sizes.patch +0041-cherry-pick-deb2742267.patch