You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
39 lines
1.3 KiB
39 lines
1.3 KiB
commit d36f457870a807f6f29880a2f2bde5e9b761f00c |
|
Author: Martin Sebor <msebor@redhat.com> |
|
Date: Tue Jan 25 17:38:31 2022 -0700 |
|
|
|
intl: Avoid -Wuse-after-free [BZ #26779] |
|
|
|
Reviewed-by: Carlos O'Donell <carlos@redhat.com> |
|
(cherry picked from commit 7845064d2d5a50e347ee9f4b78ec5e6316190154) |
|
|
|
diff --git a/intl/localealias.c b/intl/localealias.c |
|
index 375af2b03153acce..28041f2a48f643fa 100644 |
|
--- a/intl/localealias.c |
|
+++ b/intl/localealias.c |
|
@@ -318,7 +318,15 @@ read_alias_file (const char *fname, int fname_len) |
|
|
|
if (string_space_act + alias_len + value_len > string_space_max) |
|
{ |
|
- /* Increase size of memory pool. */ |
|
+#pragma GCC diagnostic push |
|
+ |
|
+#if defined __GNUC__ && __GNUC__ >= 12 |
|
+ /* Suppress the valid GCC 12 warning until the code below is changed |
|
+ to avoid using pointers to the reallocated block. */ |
|
+# pragma GCC diagnostic ignored "-Wuse-after-free" |
|
+#endif |
|
+ |
|
+ /* Increase size of memory pool. */ |
|
size_t new_size = (string_space_max |
|
+ (alias_len + value_len > 1024 |
|
? alias_len + value_len : 1024)); |
|
@@ -351,6 +359,8 @@ read_alias_file (const char *fname, int fname_len) |
|
value, value_len); |
|
string_space_act += value_len; |
|
|
|
+#pragma GCC diagnostic pop |
|
+ |
|
++nmap; |
|
++added; |
|
}
|
|
|