aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/runtime/panic.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pkg/runtime/panic.c')
-rw-r--r--src/pkg/runtime/panic.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pkg/runtime/panic.c b/src/pkg/runtime/panic.c
index a1e91d3d8f..8227a444d3 100644
--- a/src/pkg/runtime/panic.c
+++ b/src/pkg/runtime/panic.c
@@ -470,11 +470,15 @@ runtime·panicstring(int8 *s)
{
Eface err;
+ if(m->mallocing) {
+ runtime·printf("panic: %s\n", s);
+ runtime·throw("panic during malloc");
+ }
if(m->gcing) {
runtime·printf("panic: %s\n", s);
runtime·throw("panic during gc");
}
- runtime·newErrorString(runtime·gostringnocopy((byte*)s), &err);
+ runtime·newErrorCString(s, &err);
runtime·panic(err);
}