rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 235536 from home:tiwai:branches:X11:XOrg

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

OBS-URL: https://build.opensuse.org/request/show/235536
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=378
This commit is contained in:
Stefan Dirsch 2014-05-27 12:05:25 +00:00 committed by Git OBS Bridge
parent f6d83c7f30
commit 337c2ab712
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

3
Mesa.spec
View File

@ -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
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
# to be upstreamed
Patch16: u_mesa-gallium-llvmpipe-fix-SIGFPE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -514,6 +516,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1
#%patch13 -p1
###
%patch16 -p1
%build
rm -f src/mesa/depend

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;
}