diff options
| author | Ian Lance Taylor <iant@golang.org> | 2023-06-26 09:57:21 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2023-06-26 09:57:21 -0700 |
| commit | aa1e672b5d99102b03eb5fb9c51609c45f62bff7 (patch) | |
| tree | 886212591b1c9d127eaaf234a4a2e22452ea384a /libphobos/libdruntime | |
| parent | 97e31a0a2a2d2273687fcdb4e5416aab1a2186e1 (diff) | |
| parent | 3a39a31b8ae9c6465434aefa657f7fcc86f905c0 (diff) | |
| download | gcc-devel/gccgo.zip gcc-devel/gccgo.tar.gz gcc-devel/gccgo.tar.bz2 | |
Merge from trunk revision 3a39a31b8ae9c6465434aefa657f7fcc86f905c0.devel/gccgo
Diffstat (limited to 'libphobos/libdruntime')
| -rw-r--r-- | libphobos/libdruntime/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/libdruntime/core/sys/windows/stacktrace.d | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE index 986925e..1205cd9 100644 --- a/libphobos/libdruntime/MERGE +++ b/libphobos/libdruntime/MERGE @@ -1,4 +1,4 @@ -5f7552bb2829b75d5e36cc767a476e1ab35147b7 +a45f4e9f43e9fdbf0b666175e5e66b1ce4f561f6 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/libphobos/libdruntime/core/sys/windows/stacktrace.d b/libphobos/libdruntime/core/sys/windows/stacktrace.d index c10a917..a73fc9c 100644 --- a/libphobos/libdruntime/core/sys/windows/stacktrace.d +++ b/libphobos/libdruntime/core/sys/windows/stacktrace.d @@ -239,6 +239,8 @@ private: if (frameNum >= skip) { buffer[nframes++] = stackframe.AddrPC.Offset; + if (nframes >= buffer.length) + break; } frameNum++; } |