1 files changed, 8 insertions, 2 deletions
diff --git a/libgo/runtime/go-callers.c b/libgo/runtime/go-callers.c
index ea6b5db1bcb..2154a8ae4af 100644
--- a/libgo/runtime/go-callers.c
+++ b/libgo/runtime/go-callers.c
@@ -43,8 +43,14 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno,
 
   loc = &arg->locbuf[arg->index];
   loc->pc = pc;
-  loc->filename = runtime_gostring ((const byte *) filename);
-  loc->function = runtime_gostring ((const byte *) function);
+
+  /* The libbacktrace library says that these strings might disappear,
+     but with the current implementation they won't.  We can't easily
+     allocate memory here, so for now assume that we can save a
+     pointer to the strings.  */
+  loc->filename = runtime_gostringnocopy ((const byte *) filename);
+  loc->function = runtime_gostringnocopy ((const byte *) function);
+
   loc->lineno = lineno;
   ++arg->index;
   return arg->index >= arg->max;