admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2852 from jbreeden/mrb_string_value_cstr_patch

Browse Source 
Mrb string value cstr patch
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-06-23 14:54:13 +09:00
parent 0b720ffa61 9ad632559e
commit 1001be2e99
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+4 -3
View File
@@ -1985,7 +1985,8 @@ bad:
MRB_API const char*
mrb_string_value_cstr(mrb_state *mrb, mrb_value *ptr)
{
struct RString *ps = mrb_str_ptr(*ptr);
mrb_value str = mrb_str_to_str(mrb, *ptr);
struct RString *ps = mrb_str_ptr(str);
mrb_int len = mrb_str_strlen(mrb, ps);
char *p = RSTR_PTR(ps);
@@ -2002,12 +2003,12 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
const char *s;
mrb_int len;
str = mrb_str_to_str(mrb, str);
if (badcheck) {
/* Raises if the string contains a null character (the badcheck) */
s = mrb_string_value_cstr(mrb, &str);
}
else {
s = RSTRING_PTR(str);
s = mrb_string_value_ptr(mrb, str);
}
if (s) {
len = RSTRING_LEN(str);