diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2003-02-24 16:44:48 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2003-02-24 16:44:48 +0000 |
| commit | 501d64ea6a41fb8b950cefb1625a071fa365f4be (patch) | |
| tree | 68b683a8a1a7edda13ffdf2934822efbf306b0a4 | |
| parent | 22589806252efb6ab2d629eed8a3faf63dfbeb95 (diff) | |
PR#1554
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5401 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | byterun/backtrace.c | 4 | ||||
| -rw-r--r-- | stdlib/sys.ml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/byterun/backtrace.c b/byterun/backtrace.c index b7406414b..78c2316f2 100644 --- a/byterun/backtrace.c +++ b/byterun/backtrace.c @@ -80,7 +80,9 @@ void stash_backtrace(value exn, code_t pc, value * sp) if (backtrace_buffer == NULL) return; } if (backtrace_pos >= BACKTRACE_BUFFER_SIZE) return; - backtrace_buffer[backtrace_pos++] = pc; + if (pc >= start_code && pc < end_code){ + backtrace_buffer[backtrace_pos++] = pc; + } for (/*nothing*/; sp < trapsp; sp++) { code_t p = (code_t) *sp; if (p >= start_code && p < end_code) { diff --git a/stdlib/sys.ml b/stdlib/sys.ml index f034a351f..057461405 100644 --- a/stdlib/sys.ml +++ b/stdlib/sys.ml @@ -77,4 +77,4 @@ let catch_break on = (* OCaml version string, must be in the format described in sys.mli. *) -let ocaml_version = "3.06+21 (2003-01-08)";; +let ocaml_version = "3.06+23 (2003-02-24)";; |