20090830-1619

4 files changed, 4 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 7642b456..64e74883 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20090830
+	check subexp length in ed [cmbrannon79]
 20090825
 	add netmkaddr call to /appl/cmd/ftpfs.b; send errors to standard error
 20090824
diff --git a/appl/cmd/ed.b b/appl/cmd/ed.b
index f0ad6310..8c051086 100644
--- a/appl/cmd/ed.b
+++ b/appl/cmd/ed.b
@@ -1314,7 +1314,7 @@ dosub()
 		}
 		if(c == ESCFLG && (c = rhsbuf[rp++]) >= '1' && c < MAXSUB+'0') {
 			n = c-'0';
-			if(subexp != nil && subexp[n].rsp >= 0 && subexp[n].rep >= 0) {
+			if(n < len subexp && subexp[n].rsp >= 0 && subexp[n].rep >= 0) {
 				sp = place(sp, subexp[n].rsp, subexp[n].rep);
 				continue;
 			}
diff --git a/dis/ed.dis b/dis/ed.dis
index 6e6f4ebf..447a3603 100644
--- a/dis/ed.dis
+++ b/dis/ed.dis
diff --git a/include/version.h b/include/version.h
index 67d54a62..6a7cb2fc 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20090825)"
+#define VERSION	"Fourth Edition (20090830)"