1 files changed, 11 insertions, 2 deletions
diff --git a/re.c b/re.c
index 8a325308..593ed166 100644
--- a/re.c
+++ b/re.c
@@ -75,10 +75,10 @@ make_regexp(const char *s, size_t len, bool ignorecase, bool dfa, bool canfatal)
 	 * from that. 
 	 */
 	if (buf == NULL) {
-		emalloc(buf, char *, len + 2, "make_regexp");
+		emalloc(buf, char *, len + 1, "make_regexp");
 		buflen = len;
 	} else if (len > buflen) {
-		erealloc(buf, char *, len + 2, "make_regexp");
+		erealloc(buf, char *, len + 1, "make_regexp");
 		buflen = len;
 	}
 	dest = buf;
@@ -433,6 +433,15 @@ avoid_dfa(NODE *re, char *str, size_t len)
 {
 	char *end;
 
+	/*
+	 * f = @/.../
+	 * if ("foo" ~ f) ...
+	 *
+	 * This creates a Node_dynregex with NULL re_reg.
+	 */
+	if (re->re_reg == NULL)
+		return false;
+
 	if (! re->re_reg->has_anchor)
 		return false;