diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-10 17:43:49 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-10 17:43:49 +0000 |
| commit | ad5214df98f0f2dc0918c838441f6ace13f05449 (patch) | |
| tree | e732d1de3376f7165a56a9221fe4c29830d6011c /ext/objspace | |
| parent | 089d93ca1dadd5f16fa54211cf253187bd5c2c98 (diff) | |
merge revision(s) r45308,r45316: [Backport #9621]
* ext/objspace/objspace_dump.c: Check fptr before trying to dump RFILE
object fd. [GH-562]
* test/objspace/test_objspace.rb: add test
* test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file):
remove dependency on json library.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/objspace')
| -rw-r--r-- | ext/objspace/objspace_dump.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c index 9a694d33aa..e3ce7e727d 100644 --- a/ext/objspace/objspace_dump.c +++ b/ext/objspace/objspace_dump.c @@ -232,7 +232,8 @@ dump_object(VALUE obj, struct dump_config *dc) case T_FILE: fptr = RFILE(obj)->fptr; - dump_append(dc, ", \"fd\":%d", fptr->fd); + if (fptr) + dump_append(dc, ", \"fd\":%d", fptr->fd); break; case T_ZOMBIE: |