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 4295c1c..018ada7 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: 2 +Release: 3 Summary: Xorg X11 vmware video driver License: MIT URL: http://www.x.org @@ -15,6 +15,7 @@ Patch0: 0001-saa-Build-compatibility-with-xserver-1.20.patch Patch1: 0002-vmwgfx-Fix-XVideo-memory-leaks.patch Patch2: 0003-vmwgfx-Fix-a-memory-leak.patch Patch3: 0006-vmwgfx-Fix-invalid-memory-accesses-in-CloseScreen.patch +Patch4: backport-vmwgfx-fix-missing-array-notation.patch ExclusiveArch: %{ix86} x86_64 ia64 @@ -54,6 +55,12 @@ autoreconf -v --install || exit 1 %{_mandir}/man4/vmware.4* %changelog +* Mon Oct 24 2022 zhouyihang - 13.3.0-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:vmwgfx fix missing array notation + * Tue Dec 15 2020 xihaochen - 13.3.0-2 - Type:requirement - ID:NA