diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-05 08:51:43 +0900 |
| commit | 0b4f33213729a87e146d990604330c70896dac07 (patch) | |
| tree | ab1a1d05bac250042f3dfe040ee21d89c162ac21 /src/dump.c | |
| parent | b2e6a0fc04f6237f5118bf6c2f404a0d8fa4d2c4 (diff) | |
| parent | f06eceaa1965794fd2ba9910c83b4e0459550a21 (diff) | |
| download | mruby-0b4f33213729a87e146d990604330c70896dac07.tar.gz mruby-0b4f33213729a87e146d990604330c70896dac07.zip | |
merge conflict resolution
Diffstat (limited to 'src/dump.c')
| -rw-r--r-- | src/dump.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dump.c b/src/dump.c index f3cbef3a0..7b2199a02 100644 --- a/src/dump.c +++ b/src/dump.c @@ -268,8 +268,10 @@ get_syms_block_size(mrb_state *mrb, mrb_irep *irep, int type) size += DUMP_SIZE(MRB_DUMP_SIZE_OF_SHORT, type); /* snl(n) */ if (irep->syms[sym_no] != 0) { - name = mrb_sym2name(mrb, irep->syms[sym_no]); - nlen = str_dump_len((char*)name, strlen(name), type); + int len; + + name = mrb_sym2name_len(mrb, irep->syms[sym_no], &len); + nlen = str_dump_len((char*)name, len, type); size += nlen; /* sn(n) */ } } |