Skip to content

Make ruby workable with CALC_EXACT_MALLOC_SIZE set to 1 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
funny-falcon wants to merge 10 commits into from
Closed

Make ruby workable with CALC_EXACT_MALLOC_SIZE set to 1 #78

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
65c2d16
fix rb_objspace_free
funny-falcon Jan 6, 2012
09ed965
fix Init_BareVM
funny-falcon Jan 6, 2012
22b380e
fix dln_find
funny-falcon Jan 6, 2012
4c9051d
fix run_exec_dup2
funny-falcon Jan 6, 2012
fa94407
regint - use ruby_xmalloc and ruby_xfree for oniguruma
funny-falcon Jan 6, 2012
9f4bcbe
fix cfunc.c
funny-falcon Jan 6, 2012
083c6eb
fix syslog.c
funny-falcon Jan 6, 2012
982eef3
better way to fix cfunc.c
funny-falcon Jan 8, 2012
ecd6b98
fix readline
funny-falcon Jan 8, 2012
9d97846
fix error in cfunc.c
funny-falcon Jan 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix cfunc.c
  • Loading branch information
@funny-falcon
funny-falcon committed Jan 6, 2012
commit 9f4bcbec9c69f3cc2d8c4e12dacc63371dd4ae9a
4 changes: 2 additions & 2 deletions ext/dl/cfunc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dlcfunc_free(void *ptr)
{
struct cfunc_data *data = ptr;
if( data->name ){
xfree(data->name);
free(data->name);
}
xfree(data);
}
Expand Down Expand Up @@ -163,7 +163,7 @@ rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
sname = NIL_P(name) ? NULL : StringValuePtr(name);

TypedData_Get_Struct(self, struct cfunc_data, &dlcfunc_data_type, data);
if( data->name ) xfree(data->name);
if( data->name ) free(data->name);
Copy link
Member

@nurse nurse Jan 8, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think data->name is not allocated anything, isn't it?

Copy link
Author

@funny-falcon funny-falcon Jan 9, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, yes. This line is a my mistake, which is not exposed cause data->name is not allocated at this point.
This is mistake, cause I already override strdup by including <ruby/util.h>, so that I should revert to use xfree.

By the way: we could call #initialize on a live object, so that data->name could be initialized.

data->ptr = saddr;
data->name = sname ? strdup(sname) : 0;
data->type = NIL_P(type) ? DLTYPE_VOID : NUM2INT(type);
Expand Down