MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rb_dfget_vtable_ptr on x64 

This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
develop
lethosor 2016-10-21 11:46:53 -04:00
parent 97f29229cd
commit 3df74de021
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/ruby/ruby.cpp
Unescape Escape View File

@ -593,17 +593,10 @@ static VALUE rb_dfget_rtti_classname(VALUE self, VALUE vptr)
char *typeinfo = *(char**)(rtti + 0xC); char *typeinfo = *(char**)(rtti + 0xC);
// skip the .?AV, trim @@ from end // skip the .?AV, trim @@ from end
return rb_str_new(typeinfo+0xc, strlen(typeinfo+0xc)-2); return rb_str_new(typeinfo+0xc, strlen(typeinfo+0xc)-2);
#elif defined(__amd64__) || defined(__x86_64__)
// lin64
char *typeinfo = *(char**)(ptr - 0x8);
char *typestring = *(char**)(typeinfo + 0x8);
while (*typestring >= '0' && *typestring <= '9')
typestring++;
return rb_str_new(typestring, strlen(typestring));
#else #else
// lin32 // linux/osx 32/64
char *typeinfo = *(char**)(ptr - 0x4); char *typeinfo = *(char**)(ptr - sizeof(void*));
char *typestring = *(char**)(typeinfo + 0x4); char *typestring = *(char**)(typeinfo + sizeof(void*));
while (*typestring >= '0' && *typestring <= '9') while (*typestring >= '0' && *typestring <= '9')
typestring++; typestring++;
return rb_str_new(typestring, strlen(typestring)); return rb_str_new(typestring, strlen(typestring));
@ -612,8 +605,7 @@ static VALUE rb_dfget_rtti_classname(VALUE self, VALUE vptr)
static VALUE rb_dfget_vtable_ptr(VALUE self, VALUE objptr) static VALUE rb_dfget_vtable_ptr(VALUE self, VALUE objptr)
{ {
// actually, rb_dfmemory_read_int32 return rb_uint2inum(*(uintptr_t*)rb_num2ulong(objptr));
return rb_uint2inum(*(uint32_t*)rb_num2ulong(objptr));
} }
// run a dfhack command, as if typed from the dfhack console // run a dfhack command, as if typed from the dfhack console