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 #4736 from dearblue/ast-strdump

Browse Source 
Escape the AST string
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-10-02 07:07:20 +09:00
committed by GitHub
parent 97433c0263 e2f54ff594
commit c33100c4f0
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-compiler/core/parse.y
+25 -2
View File
@@ -21,6 +21,7 @@
#include <mruby/proc.h>
#include <mruby/error.h>
#include <mruby/throw.h>
#include <mruby/string.h>
#include "node.h"
#define YYLEX_PARAM p
@@ -6420,6 +6421,28 @@ dump_args(mrb_state *mrb, node *n, int offset)
}
}
/*
* This function restores the GC arena on return.
* For this reason, if a process that further generates an object is
* performed at the caller, the string pointer returned as the return
* value may become invalid.
*/
static const char*
str_dump(mrb_state *mrb, const char *str, int len)
{
mrb_int ai = mrb_gc_arena_save(mrb);
mrb_value s;
# if INT_MAX > MRB_INT_MAX / 4
/* check maximum length with "\xNN" charactor */
if (len > MRB_INT_MAX / 4) {
len = MRB_INT_MAX / 4;
}
# endif
s = mrb_str_new(mrb, str, (mrb_int)len);
s = mrb_str_dump(mrb, s);
mrb_gc_arena_restore(mrb, ai);
return RSTRING_PTR(s);
}
#endif
void
@@ -6894,7 +6917,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
break;
case NODE_STR:
printf("NODE_STR \"%s\" len %d\n", (char*)tree->car, intn(tree->cdr));
printf("NODE_STR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr));
break;
case NODE_DSTR:
@@ -6903,7 +6926,7 @@ mrb_parser_dump(mrb_state *mrb, node *tree, int offset)
break;
case NODE_XSTR:
printf("NODE_XSTR \"%s\" len %d\n", (char*)tree->car, intn(tree->cdr));
printf("NODE_XSTR %s len %d\n", str_dump(mrb, (char*)tree->car, intn(tree->cdr)), intn(tree->cdr));
break;
case NODE_DXSTR: