* regex.c (regex_compile, re_match_2_internal): Mark locals as initialized.

2 files changed, 5 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e533b07d41a..2ebe327e326 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,7 @@
         Remove unused local vars.
         (FREE_VAR): Rewrite so as not to use empty "else",
         which gcc can warn about.
+        (regex_compile, re_match_2_internal): Mark locals as initialized.
 
         * search.c (boyer_moore): Rename locals to avoid shadowing.
         * character.h (FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE): Likewise.
diff --git a/src/regex.c b/src/regex.c
index 9c950a42b22..6c6aa03e437 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2576,9 +2576,9 @@ regex_compile (const re_char *pattern, size_t size, reg_syntax_t syntax, struct
 
   /* These hold the values of p, pattern, and pend from the main
      pattern when we have pushed into a subpattern.  */
-  re_char *main_p;
-  re_char *main_pattern;
-  re_char *main_pend;
+  re_char *main_p IF_LINT (= NULL);
+  re_char *main_pattern IF_LINT (= NULL);
+  re_char *main_pend IF_LINT (= NULL);
 
 #ifdef DEBUG
   debug++;
@@ -5533,7 +5533,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
 
             /* Start of actual range_table, or end of bitmap if there is no
                range table.  */
-            re_char *range_table;
+            re_char *range_table IF_LINT (= NULL);
 
             /* Nonzero if there is a range table.  */
             int range_table_exists;