diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-12-30 05:59:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-12-30 05:59:42 +0000 |
| commit | 73dcf21c7c21693988f218a6e18a3731301614bb (patch) | |
| tree | 5ebdd3ab33605edaeb7ec35a961b993a3c55f490 /src/bytecode.c | |
| parent | e3495c37db0fbe880f1d30a25142514678c7aab2 (diff) | |
| download | emacs-73dcf21c7c21693988f218a6e18a3731301614bb.tar.gz | |
(Fbyte_code): Add error check for jumping out of range.
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 92406a78c32..7c73696a99a 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -258,6 +258,10 @@ Lisp_Object Qbytecode; 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 @@ If the third argument is incorrect, Emacs may crash.") /* 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 @@ If the third argument is incorrect, Emacs may crash.") 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 the third argument is incorrect, Emacs may crash.") if (NILP (POP)) { QUIT; + CHECK_RANGE (op); pc = XSTRING (string_saved)->data + op; } break; @@ -460,6 +467,7 @@ If the third argument is incorrect, Emacs may crash.") if (!NILP (POP)) { QUIT; + CHECK_RANGE (op); pc = XSTRING (string_saved)->data + op; } break; @@ -470,6 +478,7 @@ If the third argument is incorrect, Emacs may crash.") if (NILP (TOP)) { QUIT; + CHECK_RANGE (op); pc = XSTRING (string_saved)->data + op; } else DISCARD (1); @@ -481,6 +490,7 @@ If the third argument is incorrect, Emacs may crash.") if (!NILP (TOP)) { QUIT; + CHECK_RANGE (op); pc = XSTRING (string_saved)->data + op; } else DISCARD (1); |