diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-09-21 10:51:03 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2022-10-05 18:04:13 -0300 |
| commit | c651f9da530320e9939e6cbad57b87695eeba41c (patch) | |
| tree | 0a0b6553c48cb4ce6e65961e0648ecea018682be | |
| parent | a878a1384c8f7ae2383c4413feab88ba2fee7f17 (diff) | |
| download | glibc-c651f9da530320e9939e6cbad57b87695eeba41c.zip glibc-c651f9da530320e9939e6cbad57b87695eeba41c.tar.gz glibc-c651f9da530320e9939e6cbad57b87695eeba41c.tar.bz2 | |
locale: prevent maybe-uninitialized errors with -Os [BZ #19444]
Fixes following error when building with -Os:
| In file included from strcoll_l.c:43:
| strcoll_l.c: In function '__strcoll_l':
| ../locale/weight.h:31:26: error: 'seq2.back_us' may be used
uninitialized in this function [-Werror=maybe-uninitialized]
| int_fast32_t i = table[*(*cpp)++];
| ^~~~~~~~~
| strcoll_l.c:304:18: note: 'seq2.back_us' was declared here
| coll_seq seq1, seq2;
| ^~~~
| In file included from strcoll_l.c:43:
| ../locale/weight.h:31:26: error: 'seq1.back_us' may be used
uninitialized in this function [-Werror=maybe-uninitialized]
| int_fast32_t i = table[*(*cpp)++];
| ^~~~~~~~~
| strcoll_l.c:304:12: note: 'seq1.back_us' was declared here
| coll_seq seq1, seq2;
| ^~~~
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | locale/weight.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/locale/weight.h b/locale/weight.h index 8be2d22..4a4d5aa 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -27,7 +27,14 @@ findidx (const int32_t *table, const unsigned char *extra, const unsigned char **cpp, size_t len) { + /* With GCC 8 when compiling with -Os the compiler warns that + seq1.back_us and seq2.back_us might be used uninitialized. + This uninitialized use is impossible for the same reason + as described in comments in locale/weightwc.h. */ + DIAG_PUSH_NEEDS_COMMENT; + DIAG_IGNORE_Os_NEEDS_COMMENT (8, "-Wmaybe-uninitialized"); int32_t i = table[*(*cpp)++]; + DIAG_POP_NEEDS_COMMENT; const unsigned char *cp; const unsigned char *usrc; |