diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 07:19:16 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-30 07:19:16 +0000 |
commit | 981f9c52c6b0d7197e098ae9a0375485cf0c9c0c (patch) | |
tree | 67dcd293af1c70993db288c33f7e9ff85b603e53 /vm_dump.c | |
parent | b5d8a0b339321c1ba1453d9549d074148079707b (diff) |
vm_dump.c: no methods in segv handler
* vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv
handler. based on a patch by charliesome (Charlie Somerville)
[ruby-core:49573] [Bug #7402]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_dump.c')
-rw-r--r-- | vm_dump.c | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -675,14 +675,26 @@ rb_vm_bugreport(void) if (vm) { int i; VALUE name; + long len; + const int max_name_length = 1024; +# define LIMITED_NAME_LENGTH(s) \ + (((len = RSTRING_LEN(s)) > max_name_length) ? max_name_length : (int)len) name = vm->progname; - fprintf(stderr, "* Loaded script: %s\n", StringValueCStr(name)); + fprintf(stderr, "* Loaded script: %.*s\n", + LIMITED_NAME_LENGTH(name), RSTRING_PTR(name)); fprintf(stderr, "\n"); fprintf(stderr, "* Loaded features:\n\n"); for (i=0; i<RARRAY_LEN(vm->loaded_features); i++) { name = RARRAY_PTR(vm->loaded_features)[i]; - fprintf(stderr, " %4d %s\n", i, StringValueCStr(name)); + if (RB_TYPE_P(name, T_STRING)) { + fprintf(stderr, " %4d %.*s\n", i, + LIMITED_NAME_LENGTH(name), RSTRING_PTR(name)); + } + else { + fprintf(stderr, " %4d #<%s:%p>\n", i, + rb_class2name(CLASS_OF(name)), (void *)name); + } } fprintf(stderr, "\n"); } |