mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
xorg-server: allow build with gcc-12.1.0
fix the error: -Werror=array-bounds FAILED: render/liblibxserver_render.a.p/picture.c.o /var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-11.0-devel/toolchain/bin/x86_64-libreelec-linux-gnu-gcc -Irender/liblibxserver_render.a.p -Irender -I../render -IXext -I../Xext -IXi -I../Xi -Icomposite -I../composite -Idamageext -I../damageext -Iexa -I../exa -Ifb -I../fb -I../glamor -Imi -I../mi -Imiext/damage -I../miext/damage -Imiext/shadow -I../miext/shadow -Imiext/sync -I../miext/sync -Idbe -I../dbe -Idri3 -I../dri3 -Iinclude -I../include -Ipresent -I../present -Irandr -I../randr -Ixfixes -I../xfixes -I/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-11.0-devel/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/include -I/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-11.0-devel/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/include/X11/dri -I/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-11.0-devel/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/include/pixman-1 -I/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-11.0-devel/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/include/freetype2 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -O0 -DHAVE_DIX_CONFIG_H -fno-strict-aliasing -fvisibility=hidden -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -march=x86-64 -Wall -pipe -O2 -fomit-frame-pointer -DNDEBUG -fPIC -D_DEFAULT_SOURCE -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -MD -MQ render/liblibxserver_render.a.p/picture.c.o -MF render/liblibxserver_render.a.p/picture.c.o.d -o render/liblibxserver_render.a.p/picture.c.o -c ../render/picture.c ../render/picture.c: In function 'CreateSolidPicture': ../render/picture.c:874:26: error: array subscript 'union _SourcePict[0]' is partly outside array bounds of 'unsigned char[16]' [-Werror=array-bounds] 874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill; | ^~ ../render/picture.c:868:45: note: object of size 16 allocated by 'malloc' 868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../render/picture.c: In function 'CreateLinearGradientPicture': ../render/picture.c:906:26: error: array subscript 'union _SourcePict[0]' is partly outside array bounds of 'unsigned char[32]' [-Werror=array-bounds] 906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear; | ^~ ../render/picture.c:899:45: note: object of size 32 allocated by 'malloc' 899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../render/picture.c: In function 'CreateConicalGradientPicture': ../render/picture.c:989:26: error: array subscript 'union _SourcePict[0]' is partly outside array bounds of 'unsigned char[32]' [-Werror=array-bounds] 989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical; | ^~ ../render/picture.c:982:45: note: object of size 32 allocated by 'malloc' 982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
parent
506fa39b55
commit
90228a4c11
@ -0,0 +1,90 @@
|
|||||||
|
From 53173fdab492f0f638f6616fcf01af0b9ea6338d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Date: Thu, 20 Jan 2022 10:20:38 +0100
|
||||||
|
Subject: [PATCH] render: Fix build with gcc 12
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
The xserver fails to compile with the latest gcc 12:
|
||||||
|
|
||||||
|
render/picture.c: In function ‘CreateSolidPicture’:
|
||||||
|
render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds]
|
||||||
|
874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill;
|
||||||
|
| ^~
|
||||||
|
render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’
|
||||||
|
868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
render/picture.c: In function ‘CreateLinearGradientPicture’:
|
||||||
|
render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
|
||||||
|
906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
|
||||||
|
| ^~
|
||||||
|
render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’
|
||||||
|
899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
render/picture.c: In function ‘CreateConicalGradientPicture’:
|
||||||
|
render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
|
||||||
|
989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical;
|
||||||
|
| ^~
|
||||||
|
render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’
|
||||||
|
982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
cc1: some warnings being treated as errors
|
||||||
|
ninja: build stopped: subcommand failed.
|
||||||
|
|
||||||
|
This is because gcc 12 has become stricter and raises a warning now.
|
||||||
|
|
||||||
|
Fix the warning/error by allocating enough memory to store the union
|
||||||
|
struct.
|
||||||
|
|
||||||
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
|
||||||
|
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
|
||||||
|
(cherry picked from commit c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e)
|
||||||
|
---
|
||||||
|
render/picture.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/render/picture.c b/render/picture.c
|
||||||
|
index afa0d258f..2be4b1954 100644
|
||||||
|
--- a/render/picture.c
|
||||||
|
+++ b/render/picture.c
|
||||||
|
@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error)
|
||||||
|
}
|
||||||
|
|
||||||
|
pPicture->id = pid;
|
||||||
|
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
|
||||||
|
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
|
||||||
|
if (!pPicture->pSourcePict) {
|
||||||
|
*error = BadAlloc;
|
||||||
|
free(pPicture);
|
||||||
|
@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2,
|
||||||
|
}
|
||||||
|
|
||||||
|
pPicture->id = pid;
|
||||||
|
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
|
||||||
|
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
|
||||||
|
if (!pPicture->pSourcePict) {
|
||||||
|
*error = BadAlloc;
|
||||||
|
free(pPicture);
|
||||||
|
@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner,
|
||||||
|
}
|
||||||
|
|
||||||
|
pPicture->id = pid;
|
||||||
|
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient));
|
||||||
|
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
|
||||||
|
if (!pPicture->pSourcePict) {
|
||||||
|
*error = BadAlloc;
|
||||||
|
free(pPicture);
|
||||||
|
@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle,
|
||||||
|
}
|
||||||
|
|
||||||
|
pPicture->id = pid;
|
||||||
|
- pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
|
||||||
|
+ pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
|
||||||
|
if (!pPicture->pSourcePict) {
|
||||||
|
*error = BadAlloc;
|
||||||
|
free(pPicture);
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user