Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001 |
| 2 | From: Olivier Fourdan <ofourdan@redhat.com> |
| 3 | Date: Thu, 20 Jan 2022 10:20:38 +0100 |
| 4 | Subject: [PATCH] render: Fix build with gcc 12 |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | The xserver fails to compile with the latest gcc 12: |
| 10 | |
| 11 | render/picture.c: In function ‘CreateSolidPicture’: |
| 12 | render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds] |
| 13 | 874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill; |
| 14 | | ^~ |
| 15 | render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’ |
| 16 | 868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); |
| 17 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 18 | render/picture.c: In function ‘CreateLinearGradientPicture’: |
| 19 | render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] |
| 20 | 906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear; |
| 21 | | ^~ |
| 22 | render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’ |
| 23 | 899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); |
| 24 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 25 | render/picture.c: In function ‘CreateConicalGradientPicture’: |
| 26 | render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds] |
| 27 | 989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical; |
| 28 | | ^~ |
| 29 | render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’ |
| 30 | 982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); |
| 31 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 32 | cc1: some warnings being treated as errors |
| 33 | ninja: build stopped: subcommand failed. |
| 34 | |
| 35 | This is because gcc 12 has become stricter and raises a warning now. |
| 36 | |
| 37 | Fix the warning/error by allocating enough memory to store the union |
| 38 | struct. |
| 39 | |
| 40 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e] |
| 41 | Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> |
| 42 | Acked-by: Michel Dänzer <mdaenzer@redhat.com> |
| 43 | Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256 |
| 44 | --- |
| 45 | render/picture.c | 8 ++++---- |
| 46 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 47 | |
| 48 | diff --git a/render/picture.c b/render/picture.c |
| 49 | index afa0d25..2be4b19 100644 |
| 50 | --- a/render/picture.c |
| 51 | +++ b/render/picture.c |
| 52 | @@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error) |
| 53 | } |
| 54 | |
| 55 | pPicture->id = pid; |
| 56 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); |
| 57 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); |
| 58 | if (!pPicture->pSourcePict) { |
| 59 | *error = BadAlloc; |
| 60 | free(pPicture); |
| 61 | @@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2, |
| 62 | } |
| 63 | |
| 64 | pPicture->id = pid; |
| 65 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient)); |
| 66 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); |
| 67 | if (!pPicture->pSourcePict) { |
| 68 | *error = BadAlloc; |
| 69 | free(pPicture); |
| 70 | @@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner, |
| 71 | } |
| 72 | |
| 73 | pPicture->id = pid; |
| 74 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient)); |
| 75 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); |
| 76 | if (!pPicture->pSourcePict) { |
| 77 | *error = BadAlloc; |
| 78 | free(pPicture); |
| 79 | @@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle, |
| 80 | } |
| 81 | |
| 82 | pPicture->id = pid; |
| 83 | - pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient)); |
| 84 | + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict)); |
| 85 | if (!pPicture->pSourcePict) { |
| 86 | *error = BadAlloc; |
| 87 | free(pPicture); |
| 88 | -- |
| 89 | 2.35.1 |
| 90 | |