kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

avoid passing NULL to memset

Browse source 
`GC::Profiler.enable; GC::Profiler.clear` tries to clear
objspace->profile.records but it has never been allocated before.
Thus the MEMCPY took NULL argument before this changeset.

The objspace->profile.records is allocated appropriately elsewhere.
Why not juts free it if any?  That should work.
This commit is contained in:
Urabe, Shyouhei 2019-04-26 18:59:26 +09:00
parent 34e1079aef
commit f95f07dad3
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gc.c
View file

@ -10476,16 +10476,14 @@ static VALUE
gc_profile_clear(void) gc_profile_clear(void)
{ {
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
if (GC_PROFILE_RECORD_DEFAULT_SIZE * 2 < objspace->profile.size) { void *p = objspace->profile.records;
objspace->profile.size = GC_PROFILE_RECORD_DEFAULT_SIZE * 2; objspace->profile.records = NULL;
objspace->profile.records = realloc(objspace->profile.records, sizeof(gc_profile_record) * objspace->profile.size); objspace->profile.size = 0;
if (!objspace->profile.records) {
rb_memerror();
}
}
MEMZERO(objspace->profile.records, gc_profile_record, objspace->profile.size);
objspace->profile.next_index = 0; objspace->profile.next_index = 0;
objspace->profile.current_record = 0; objspace->profile.current_record = 0;
if (p) {
free(p);
}
return Qnil; return Qnil;
} }