fix overlapping data buffer issue; patch from Tim Landsheet scfc_de

1 files changed, 8 insertions, 4 deletions

diff --git a/regex.c b/regex.c
index f5b9603..e12cf65 100644
--- a/regex.c
+++ b/regex.c
@@ -55,16 +55,20 @@ void flex_regcomp(regex_t *preg, const char *regex, int cflags)
 
 	if ((err = regcomp (preg, regex, cflags)) != 0) {
         const int errbuf_sz = 200;
-        char * errbuf=0;
+        char *errbuf, *rxerr;
 
 		errbuf = (char*)flex_alloc(errbuf_sz *sizeof(char));
 		if (!errbuf)
-			flexfatal(_("Unable to allocate buffer to report regcomp failed"));
-		regerror (err, preg, errbuf, errbuf_sz);
-		snprintf (errbuf, errbuf_sz, "regcomp failed: %s\n", errbuf);
+			flexfatal(_("Unable to allocate buffer to report regcomp"));
+		rxerr = (char*)flex_alloc(errbuf_sz *sizeof(char));
+		if (!rxerr)
+			flexfatal(_("Unable to allocate buffer for regerror"));
+		regerror (err, preg, rxerr, errbuf_sz);
+		snprintf (errbuf, errbuf_sz, "regcomp for \"%s\" failed: %s", regex, rxerr);
 
 		flexfatal (errbuf);
         free(errbuf);
+        free(rxerr);
 	}
 }