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 readline
  • Loading branch information
@funny-falcon
funny-falcon committed Jan 8, 2012
commit ecd6b98dfb8ed1bf69f988409321f34281b97ca6
6 changes: 3 additions & 3 deletions ext/readline/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,10 +672,10 @@ readline_attempted_completion_function(const char *text, int start, int end)
matches = RARRAY_LEN(ary);
if (matches == 0)
return NULL;
result = ALLOC_N(char *, matches + 2);
result = (char**)malloc((matches + 2)*sizeof(char*));
for (i = 0; i < matches; i++) {
temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
strcpy(result[i + 1], RSTRING_PTR(temp));
}
result[matches + 1] = NULL;
Expand Down Expand Up @@ -707,7 +707,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
if (low > si) low = si;
i++;
}
result[0] = ALLOC_N(char, low + 1);
result[0] = (char*)malloc(low + 1);
strncpy(result[0], result[1], low);
result[0][low] = '\0';
}
Expand Down