SHA256
1
0
forked from pool/wine

Updating link to change in openSUSE:Factory/wine revision 68.0

OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=40904756f548e696fe183a67f4a5ecd5
This commit is contained in:
OBS User buildservice-autocommit 2010-02-18 16:34:51 +00:00 committed by Git OBS Bridge
parent 3db23bbf32
commit ea949759eb
3 changed files with 49 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From 4832105237c48b22caaaecd24f2b48e4c2b9bc8e Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.de>
Date: Mon, 15 Feb 2010 17:23:05 +0100
Subject: [PATCH] shell32: replace strcpy by memcpy due to slightly undefined struct handling
Hi,
Writing over the end of a struct is only clearly defined if the struct
is standalone and not contained in another.
So for gcc 4.5 the strcpy triggers a fortify overflow error and we
better use memcpy.
Ciao, Marcus
---
dlls/shell32/pidl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 3e61144..4b8858b 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1600,13 +1600,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void)
TRACE("\n");
- pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")]));
+ pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[strlen("Entire Network")+1]));
if (pidlOut)
{
LPPIDLDATA pData = _ILGetDataPointer(pidlOut);
pData->u.network.dummy = 0;
- strcpy(pData->u.network.szNames, "Entire Network");
+ memcpy(pData->u.network.szNames, "Entire Network", strlen("Entire Network")+1);
}
return pidlOut;
}
--
1.6.6.1

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 18 17:25:22 CET 2010 - meissner@suse.de
- fixed gcc 4.5 issue
-------------------------------------------------------------------
Fri Feb 5 20:27:26 CET 2010 - meissner@suse.de

View File

@ -23,13 +23,14 @@ License: LGPLv2.1+
Group: System/Emulators/PC
AutoReqProv: on
Version: 1.1.38
Release: 1
Release: 2
Summary: An MS Windows Emulator
Url: http://www.winehq.com
Source0: wine-%version.tar.bz2
Source1: http://kegel.com/wine/winetricks
Source3: README.SuSE
Source4: wine.desktop
Patch0: 0001-shell32-replace-strcpy-by-memcpy-due-to-slightly-und.patch
Recommends: wine-gecko
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libhal.so.1 libncurses.so.5 libfreetype.so.6 libpng12.so.0 libjpeg.so.62 libcrypto.so.0.9.8 libssl.so.0.9.8 libfontconfig.so.1 libcups.so.2 libgnutls.so.26
@ -65,6 +66,7 @@ libraries.
%prep
%setup -q
%patch0 -p1
#
cp %{S:3} .
#