diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-04-29 18:34:03 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-29 18:34:03 +0900 |
| commit | a343439973404f96e155b96a92eb71dadac93f6f (patch) | |
| tree | 51e2fd4a413ca848690d0606f11b890f788ed4c8 | |
| parent | e2ac2a82a5c344de3369a6f988ec40bb5510ab45 (diff) | |
| parent | 49b2e8c3a9ef9a0ba115c000327c0bcd62911e44 (diff) | |
| download | mruby-a343439973404f96e155b96a92eb71dadac93f6f.tar.gz mruby-a343439973404f96e155b96a92eb71dadac93f6f.zip | |
Merge pull request #4985 from dearblue/print-gems
Makes `mrb_any_to_s()` accept an object whose class is `NULL`
| -rw-r--r-- | src/class.c | 5 | ||||
| -rw-r--r-- | src/string.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c index b0af74e74..d30edd41e 100644 --- a/src/class.c +++ b/src/class.c @@ -1728,7 +1728,10 @@ mrb_class_real(struct RClass* cl) MRB_API const char* mrb_class_name(mrb_state *mrb, struct RClass* c) { - mrb_value name = class_name_str(mrb, c); + mrb_value name; + + if (c == NULL) return NULL; + name = class_name_str(mrb, c); return RSTRING_PTR(name); } diff --git a/src/string.c b/src/string.c index 458c511dc..44e3c9069 100644 --- a/src/string.c +++ b/src/string.c @@ -2759,7 +2759,7 @@ mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len) MRB_API mrb_value mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr) { - return mrb_str_cat(mrb, str, ptr, strlen(ptr)); + return mrb_str_cat(mrb, str, ptr, ptr ? strlen(ptr) : 0); } MRB_API mrb_value |