From patchwork Sun Mar 1 19:29:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Zwing?= X-Patchwork-Id: 444780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 9EAA31400D5 for ; Mon, 2 Mar 2015 06:29:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=dawncrow.de header.i=@dawncrow.de header.b=BkHO6c2G; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CBEFC952BD; Sun, 1 Mar 2015 19:29:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EVIYtOl2bzW7; Sun, 1 Mar 2015 19:29:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id F17EB9528B; Sun, 1 Mar 2015 19:29:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B43BB1C2930 for ; Sun, 1 Mar 2015 19:29:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD7A091907 for ; Sun, 1 Mar 2015 19:29:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iPo2TWZ1a0GV for ; Sun, 1 Mar 2015 19:29:29 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.217]) by whitealder.osuosl.org (Postfix) with ESMTPS id D9A1C9126D for ; Sun, 1 Mar 2015 19:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1425238165; l=2216; s=domk; d=dawncrow.de; h=Content-Transfer-Encoding:Content-Type:Subject:To:MIME-Version:From: Date; bh=okLGpl/r5TgUOQXYHtNTpZdRxGS0JKOdt01v42M6c7w=; b=BkHO6c2GmE0BnKZusCAmApy27tS5a3X8hpDs3hH4lBFERESeFvCADmscIgJTDLAsmYu iHm7D0YbiKZSe1EYyG+TNC1X8yeTVSXldfzcQp1L+0u85JsEZBeTQmtFd++dDh9zVgp6T lOCqiAxPXjh94aEvsklsWUXJA/oslzYVNhQ= X-RZG-AUTH: :ImkWY2CseuihIZy6ZWWciR6unPh5JPSWE7VxbdUCFBN5njG7Q28CH4dMfXqI X-RZG-CLASS-ID: mo00 Received: from [192.168.178.50] ([185.61.122.41]) by smtp.strato.de (RZmta 37.3 AUTH) with ESMTPSA id 000fcbr21JTPdPT (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) for ; Sun, 1 Mar 2015 20:29:25 +0100 (CET) Message-ID: <54F3688E.6050600@dawncrow.de> Date: Sun, 01 Mar 2015 20:29:18 +0100 From: =?UTF-8?B?QW5kcsOpIEhlbnRzY2hlbA==?= User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: buildroot@busybox.net Subject: [Buildroot] [PATCH next] wine: Add patch to fix miscompilation with gcc 4.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: André Hentschel --- 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. package/wine/0001-Prevent-call-to-memset-with-a-null-pointer.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) 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 */