pool/Mesa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 235538 from X11:XOrg

Browse Source 
- Fix zero-division with empty height (bnc#879462)
  u_mesa-gallium-llvmpipe-fix-SIGFPE.patch (forwarded request 235536 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/235538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=213
This commit is contained in:
Stephan Kulow 2014-06-02 05:04:24 +00:00 committed by Git OBS Bridge
commit 1476361994
5 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Mesa.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue May 27 13:39:00 CEST 2014 - tiwai@suse.de
- Fix zero-division with empty height (bnc#879462)
u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
-------------------------------------------------------------------
Mon May 26 23:36:44 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
- Update to version 10.2-rc4:
Another round of bugfixes towards the final 10.2
-------------------------------------------------------------------
Mon May 19 16:10:36 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
- Update to 10.2-rc3
Even more bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 12 09:32:19 UTC 2014 - schwab@suse.de Mon May 12 09:32:19 UTC 2014 - schwab@suse.de

7
Mesa.spec
View File

@ -58,10 +58,10 @@
%endif %endif
%define _name_archive MesaLib %define _name_archive MesaLib
%define _version 10.2.0-rc2 %define _version 10.2.0-rc4
Name: Mesa Name: Mesa
Version: 10.2.0~rc2 Version: 10.2.0~rc4
Release: 0 Release: 0
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
@ -149,6 +149,8 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
Patch13: u_mesa-8.0.1-fix-16bpp.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe # Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# to be upstreamed
Patch16: u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1 #%patch15 -p1
#%patch13 -p1 #%patch13 -p1
### ###
%patch16 -p1
%build %build
rm -f src/mesa/depend rm -f src/mesa/depend

3
MesaLib-10.2.0-rc2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7ef2f04c1decbee6ff0b452d49e61bc88f3e349581e232c6d4287b20c083ce2
size 7098130

3
MesaLib-10.2.0-rc4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11c015b59e039d6615d2443789429f97b96c3880085416f194c421a17242c63d
size 7110521

24
u_mesa-gallium-llvmpipe-fix-SIGFPE.patch Normal file
View File

@ -0,0 +1,24 @@
From: Takashi Iwai <tiwai@suse.de>
Subject: Fix zero-division in llvmpipe_texture_layout()
References: bnc#879462
Fix the crash of "gnome-control-center info" invocation on QEMU where
zero height is passed at init.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/gallium/drivers/llvmpipe/lp_texture.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -115,7 +115,7 @@ llvmpipe_texture_layout(struct llvmpipe_
lpr->row_stride[level] = align(nblocksx * block_size, util_cpu_caps.cacheline);
/* if row_stride * height > LP_MAX_TEXTURE_SIZE */
- if (lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) {
+ if (nblocksy && lpr->row_stride[level] > LP_MAX_TEXTURE_SIZE / nblocksy) {
/* image too large */
goto fail;
}