diff options
| -rw-r--r-- | ext/json/ext/generator/generator.c | 35 | ||||
| -rw-r--r-- | ext/json/ext/generator/generator.h | 1 | ||||
| -rw-r--r-- | lib/json/pure/generator.rb | 8 |
3 files changed, 34 insertions, 10 deletions
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index 21fef2b..a765486 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -852,6 +852,31 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj) return fbuffer_to_s(buffer); } +static int isArrayOrObject(VALUE string) +{ + char c, *q, *p = RSTRING_PTR(string), *pend = p + RSTRING_LEN(string); + + while (p < pend) { + if (isspace(*p)) { + p++; + continue; + } + if (*p == '[') c = ']'; + else if (*p == '{') c = '}'; + else return 0; + q = pend - 1; + while (q > p) { + if (isspace(*q)) { + q--; + continue; + } + if (*q == c) return 1; + } + return 0; + } + return 0; +} + /* * call-seq: generate(obj) * @@ -862,15 +887,9 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj) static VALUE cState_generate(VALUE self, VALUE obj) { VALUE result = cState_partial_generate(self, obj); - VALUE re, args[2]; GET_STATE(self); - if (!state->quirks_mode) { - args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z"); - args[1] = CRegexp_MULTILINE; - re = rb_class_new_instance(2, args, rb_cRegexp); - if (NIL_P(rb_funcall(re, i_match, 1, result))) { - rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed"); - } + if (!state->quirks_mode && !isArrayOrObject(result)) { + rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed"); } return result; } diff --git a/ext/json/ext/generator/generator.h b/ext/json/ext/generator/generator.h index 3220178..901b62c 100644 --- a/ext/json/ext/generator/generator.h +++ b/ext/json/ext/generator/generator.h @@ -4,6 +4,7 @@ #include <string.h> #include <assert.h> #include <math.h> +#include <ctype.h> #include "ruby.h" diff --git a/lib/json/pure/generator.rb b/lib/json/pure/generator.rb index 9141ae5..3d5f09f 100644 --- a/lib/json/pure/generator.rb +++ b/lib/json/pure/generator.rb @@ -255,8 +255,12 @@ module JSON # GeneratorError exception. def generate(obj) result = obj.to_json(self) - if !@quirks_mode && result !~ /\A\s*(?:\[.*\]|\{.*\})\s*\Z/m - raise GeneratorError, "only generation of JSON objects or arrays allowed" + unless @quirks_mode + unless result =~ /\A\s*\[/ && result =~ /\]\s*\Z/ || + result =~ /\A\s*\{/ && result =~ /\}\s*\Z/ + then + raise GeneratorError, "only generation of JSON objects or arrays allowed" + end end result end |