1*4882a593SmuzhiyunFrom c426ef7486af62ee472ddd78f1c261a975427ccb Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Florian Weimer <fweimer@redhat.com> 3*4882a593SmuzhiyunDate: Tue, 3 Sep 2019 14:01:39 +0200 4*4882a593SmuzhiyunSubject: [PATCH 14/20] localedef: Use initializer for flexible array member 5*4882a593Smuzhiyun [BZ #24950] 6*4882a593Smuzhiyun 7*4882a593Smuzhiyunstruct charseq used a zero-length array instead of a flexible array 8*4882a593Smuzhiyunmember. This required a strange construct to initialize struct 9*4882a593Smuzhiyuncharseq objects, and GCC 10 warns about that: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyuncc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 12*4882a593SmuzhiyunIn file included from programs/repertoire.h:24, 13*4882a593Smuzhiyun from programs/localedef.h:32, 14*4882a593Smuzhiyun from programs/ld-ctype.c:35: 15*4882a593Smuzhiyunprograms/charmap.h:63:17: note: destination object declared here 16*4882a593Smuzhiyun 63 | unsigned char bytes[0]; 17*4882a593Smuzhiyun | ^~~~~ 18*4882a593Smuzhiyuncc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 19*4882a593Smuzhiyunprograms/charmap.h:63:17: note: destination object declared here 20*4882a593Smuzhiyuncc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 21*4882a593Smuzhiyunprograms/charmap.h:63:17: note: destination object declared here 22*4882a593Smuzhiyuncc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 23*4882a593Smuzhiyunprograms/charmap.h:63:17: note: destination object declared here 24*4882a593Smuzhiyun 25*4882a593SmuzhiyunThe change makes the object physically const, but it is not expected 26*4882a593Smuzhiyunto be modified. 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun(cherry picked from commit 1471fa556afb428c4a4c46cf5543a4101d5bcf91) 29*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 30*4882a593Smuzhiyun--- 31*4882a593Smuzhiyun locale/programs/charmap.h | 2 +- 32*4882a593Smuzhiyun locale/programs/ld-ctype.c | 12 ++++++------ 33*4882a593Smuzhiyun 2 files changed, 7 insertions(+), 7 deletions(-) 34*4882a593Smuzhiyun 35*4882a593Smuzhiyundiff --git a/locale/programs/charmap.h b/locale/programs/charmap.h 36*4882a593Smuzhiyunindex 66a4385e..a8396cb4 100644 37*4882a593Smuzhiyun--- a/locale/programs/charmap.h 38*4882a593Smuzhiyun+++ b/locale/programs/charmap.h 39*4882a593Smuzhiyun@@ -60,7 +60,7 @@ struct charseq 40*4882a593Smuzhiyun const char *name; 41*4882a593Smuzhiyun uint32_t ucs4; 42*4882a593Smuzhiyun int nbytes; 43*4882a593Smuzhiyun- unsigned char bytes[0]; 44*4882a593Smuzhiyun+ unsigned char bytes[]; 45*4882a593Smuzhiyun }; 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun 48*4882a593Smuzhiyundiff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c 49*4882a593Smuzhiyunindex f791e6b7..dffe7bf5 100644 50*4882a593Smuzhiyun--- a/locale/programs/ld-ctype.c 51*4882a593Smuzhiyun+++ b/locale/programs/ld-ctype.c 52*4882a593Smuzhiyun@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); 53*4882a593Smuzhiyun for (cnt = 0; cnt < 10; ++cnt) 54*4882a593Smuzhiyun if (ctype->mboutdigits[cnt] == NULL) 55*4882a593Smuzhiyun { 56*4882a593Smuzhiyun- static struct charseq replace[2]; 57*4882a593Smuzhiyun- 58*4882a593Smuzhiyun if (!warned) 59*4882a593Smuzhiyun { 60*4882a593Smuzhiyun record_error (0, 0, _("\ 61*4882a593Smuzhiyun@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); 62*4882a593Smuzhiyun warned = 1; 63*4882a593Smuzhiyun } 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun- replace[0].nbytes = 1; 66*4882a593Smuzhiyun- replace[0].bytes[0] = '?'; 67*4882a593Smuzhiyun- replace[0].bytes[1] = '\0'; 68*4882a593Smuzhiyun- ctype->mboutdigits[cnt] = &replace[0]; 69*4882a593Smuzhiyun+ static const struct charseq replace = 70*4882a593Smuzhiyun+ { 71*4882a593Smuzhiyun+ .nbytes = 1, 72*4882a593Smuzhiyun+ .bytes = "?", 73*4882a593Smuzhiyun+ }; 74*4882a593Smuzhiyun+ ctype->mboutdigits[cnt] = (struct charseq *) &replace; 75*4882a593Smuzhiyun } 76*4882a593Smuzhiyun 77*4882a593Smuzhiyun warned = 0; 78*4882a593Smuzhiyun-- 79*4882a593Smuzhiyun2.20.1 80*4882a593Smuzhiyun 81