From: Eric Andersen <andersen@codepoet.org>
Date: Sun, 13 May 2001 00:48:09 +0000 (-0000)
Subject: A patch from Aaron Lehmann <aaronl@vitelus.com> to fix a
X-Git-Tag: 0_52~197
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ddb00545b7fb84138a14a511def4526ac2bc0709;p=oweals%2Fbusybox.git

A patch from Aaron Lehmann <aaronl@vitelus.com> to fix a
crash on a broken regexp.
---

diff --git a/editors/vi.c b/editors/vi.c
index 5a68ba9f1..6d1502966 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
  */
 
 char *vi_Version =
-	"$Id: vi.c,v 1.7 2001/05/07 22:57:47 andersen Exp $";
+	"$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $";
 
 /*
  * To compile for standalone use:
@@ -2076,8 +2076,10 @@ static void colon(Byte * buf)
 		c = orig_buf[1];	// what is the delimiter
 		F = orig_buf + 2;	// start of "find"
 		R = (Byte *) strchr((char *) F, c);	// middle delimiter
+		if (!R) goto colon_s_fail;
 		*R++ = '\0';	// terminate "find"
 		buf1 = (Byte *) strchr((char *) R, c);
+		if (!buf1) goto colon_s_fail;
 		*buf1++ = '\0';	// terminate "replace"
 		if (*buf1 == 'g') {	// :s/foo/bar/g
 			buf1++;
@@ -2168,6 +2170,12 @@ static void colon(Byte * buf)
   vc1:
 	dot = bound_dot(dot);	// make sure "dot" is valid
 	return;
+#ifdef BB_FEATURE_VI_SEARCH
+colon_s_fail:
+	psb(":s expression missing delimiters");
+	return;
+#endif
+
 }
 
 static void Hit_Return(void)
diff --git a/vi.c b/vi.c
index 5a68ba9f1..6d1502966 100644
--- a/vi.c
+++ b/vi.c
@@ -19,7 +19,7 @@
  */
 
 char *vi_Version =
-	"$Id: vi.c,v 1.7 2001/05/07 22:57:47 andersen Exp $";
+	"$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $";
 
 /*
  * To compile for standalone use:
@@ -2076,8 +2076,10 @@ static void colon(Byte * buf)
 		c = orig_buf[1];	// what is the delimiter
 		F = orig_buf + 2;	// start of "find"
 		R = (Byte *) strchr((char *) F, c);	// middle delimiter
+		if (!R) goto colon_s_fail;
 		*R++ = '\0';	// terminate "find"
 		buf1 = (Byte *) strchr((char *) R, c);
+		if (!buf1) goto colon_s_fail;
 		*buf1++ = '\0';	// terminate "replace"
 		if (*buf1 == 'g') {	// :s/foo/bar/g
 			buf1++;
@@ -2168,6 +2170,12 @@ static void colon(Byte * buf)
   vc1:
 	dot = bound_dot(dot);	// make sure "dot" is valid
 	return;
+#ifdef BB_FEATURE_VI_SEARCH
+colon_s_fail:
+	psb(":s expression missing delimiters");
+	return;
+#endif
+
 }
 
 static void Hit_Return(void)