summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--vm_dump.c9
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 975b00972c..3c4d5a4c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 21 21:12:54 2012 Masaya Tarui <tarui@ruby-lang.org>
+
+ * vm_dump.c (rb_vm_bugreport): commentout addr2line call temporarily
+ in order to avoid segv. anyone can fix addr2line?
+ [Bug #7597] [ruby-dev:46786]
+
Fri Dec 21 20:38:28 2012 Koichi Sasada <ko1@atdot.net>
* iseq.c (Init_ISeq): remove definition of the following methods:
diff --git a/vm_dump.c b/vm_dump.c
index 292280c40f..50d3ebfdf5 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -644,14 +644,15 @@ rb_vm_bugreport(void)
char **syms = backtrace_symbols(trace, n);
if (syms) {
-#ifdef USE_ELF
- rb_dump_backtrace_with_lines(n, trace, syms);
-#else
+/* commentout temporarily. we have to fix addr2line. see [Bug #7597] */
+/* #ifdef USE_ELF */
+/* rb_dump_backtrace_with_lines(n, trace, syms); */
+/* #else */
int i;
for (i=0; i<n; i++) {
fprintf(stderr, "%s\n", syms[i]);
}
-#endif
+/* #endif */
free(syms);
}
#elif defined(_WIN32)