# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 851925582 0
# Node ID 79ea730b7e20124402473c256b530e036712add8
# Parent  b87f9489bcd33039adf5a2b7dc67acd16f4379c9
(Fbyte_code): Add error check for jumping out of range.

diff -r b87f9489bcd3 -r 79ea730b7e20 src/bytecode.c
--- a/src/bytecode.c	Mon Dec 30 05:35:54 1996 +0000
+++ b/src/bytecode.c	Mon Dec 30 05:59:42 1996 +0000
@@ -258,6 +258,10 @@
   if (consing_since_gc > gc_cons_threshold)	\
     Fgarbage_collect ();
 
+/* Check for jumping out of range.  */
+#define CHECK_RANGE(ARG)			\
+  if (ARG >= bytestr_length) abort ()
+
 DEFUN ("byte-code", Fbyte_code, Sbyte_code, 3, 3, 0,
   "Function used internally in byte-compiled code.\n\
 The first argument, BYTESTR, is a string of byte code;\n\
@@ -288,6 +292,7 @@
   /* Cached address of beginning of string,
      valid if BYTESTR equals STRING_SAVED.  */
   register unsigned char *strbeg;
+  int bytestr_length = XSTRING (bytestr)->size;
 
   CHECK_STRING (bytestr, 0);
   if (!VECTORP (vector))
@@ -441,6 +446,7 @@
 	  MAYBE_GC ();
 	  QUIT;
 	  op = FETCH2;    /* pc = FETCH2 loses since FETCH2 contains pc++ */
+	  CHECK_RANGE (op);
 	  pc = XSTRING (string_saved)->data + op;
 	  break;
 
@@ -450,6 +456,7 @@
 	  if (NILP (POP))
 	    {
 	      QUIT;
+	      CHECK_RANGE (op);
 	      pc = XSTRING (string_saved)->data + op;
 	    }
 	  break;
@@ -460,6 +467,7 @@
 	  if (!NILP (POP))
 	    {
 	      QUIT;
+	      CHECK_RANGE (op);
 	      pc = XSTRING (string_saved)->data + op;
 	    }
 	  break;
@@ -470,6 +478,7 @@
 	  if (NILP (TOP))
 	    {
 	      QUIT;
+	      CHECK_RANGE (op);
 	      pc = XSTRING (string_saved)->data + op;
 	    }
 	  else DISCARD (1);
@@ -481,6 +490,7 @@
 	  if (!NILP (TOP))
 	    {
 	      QUIT;
+	      CHECK_RANGE (op);
 	      pc = XSTRING (string_saved)->data + op;
 	    }
 	  else DISCARD (1);