From 2ca6f44ea0de208fcf69d304ca8f85d88b8d447f Mon Sep 17 00:00:00 2001 From: sherlock2010 <15151851377@163.com> Date: Mon, 24 Oct 2022 09:12:25 +0000 Subject: [PATCH] vmwgfx fix missing array notation (cherry picked from commit 202a238f3207005e872c2c433b2746a2a08caa45) --- ...rt-vmwgfx-fix-missing-array-notation.patch | 32 +++++++++++++++++++ xorg-x11-drv-vmware.spec | 9 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 backport-vmwgfx-fix-missing-array-notation.patch diff --git a/backport-vmwgfx-fix-missing-array-notation.patch b/backport-vmwgfx-fix-missing-array-notation.patch new file mode 100644 index 0000000..1321ed7 --- /dev/null +++ b/backport-vmwgfx-fix-missing-array-notation.patch @@ -0,0 +1,32 @@ +From 77b8183b3395333d5d4c73e25c2d011748f15eda Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sun, 8 May 2022 03:00:10 +0000 +Subject: [PATCH] vmwgfx: fix missing array notation + + Fixes error identified by gcc-12.1.0 compiler + +make + CC libvmwgfx_la-vmwgfx_tex_video.lo +vmwgfx_tex_video.c: In function 'stop_video': +vmwgfx_tex_video.c:240:20: error: the comparison will always evaluate as 'true' for the address of 'yuv' will never be NULL [-Werror=address] + 240 | if (priv->yuv[i]) { + | ^~~~ +--- + vmwgfx/vmwgfx_tex_video.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c +index acc2b56..480a5f1 100644 +--- a/vmwgfx/vmwgfx_tex_video.c ++++ b/vmwgfx/vmwgfx_tex_video.c +@@ -237,7 +237,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown) + + for (i=0; i<3; ++i) { + for (j=0; j<2; ++j) { +- if (priv->yuv[i]) { ++ if (priv->yuv[j][i]) { + xa_surface_destroy(priv->yuv[j][i]); + priv->yuv[j][i] = NULL; + } +-- +GitLab diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec index 15d6afd..6f37c00 100644 --- a/xorg-x11-drv-vmware.spec +++ b/xorg-x11-drv-vmware.spec @@ -5,7 +5,7 @@ Name: xorg-x11-drv-vmware Version: 13.3.0 -Release: 1 +Release: 2 Summary: Xorg X11 vmware video driver License: MIT URL: http://www.x.org @@ -14,6 +14,7 @@ Source0: ftp://ftp.x.org/pub/individual/driver/xf86-video-vmware-%{versio Patch0: 0001-vmwgfx-Fix-XVideo-memory-leaks.patch Patch1: 0002-vmwgfx-Fix-a-memory-leak.patch Patch2: 0003-vmwgfx-Fix-invalid-memory-accesses-in-CloseScreen.patch +Patch3: backport-vmwgfx-fix-missing-array-notation.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -53,6 +54,12 @@ autoreconf -v --install || exit 1 %{_mandir}/man4/vmware.4* %changelog +* Mon Oct 24 2022 zhouyihang - 13.3.0-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:vmwgfx fix missing array notation + * Wed Aug 26 2020 gaihuiying - 13.3.0-1 - Type:requirement - ID:NA