3 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 88445cd50dc..d59e71d101a 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include <regex/regex.h>   
 #include <regex/utils.h>
@@ -284,8 +285,8 @@ register struct parse *p;
 int stop;			/* character this ERE should end at */
 {
 	register char c;
-	register sopno prevback;
-	register sopno prevfwd;
+	register sopno prevback = 0;
+	register sopno prevfwd = 0;
 	register sopno conc;
 	register int first = 1;		/* is this the first alternative? */
 
@@ -1592,8 +1593,8 @@ struct parse *p;
 register struct re_guts *g;
 {
 	register sop *scan;
-	sop *start;
-	register sop *newstart;
+	sop *start = 0;
+	register sop *newstart = 0;
 	register sopno newlen;
 	register sop s;
 	register char *cp;
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index dbfcc250613..fef668fadfb 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include <regex/regex.h>
 #include <regex/utils.h>
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index a34f3f8daff..115a17667bb 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -54,6 +54,7 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <assert.h>
 
 #include <regex/regex.h>
 #include <regex/utils.h>