diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 03:05:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-12 03:05:45 +0000 |
| commit | 062d2ee6f798205c3046730d0d348cfd0d0bc09d (patch) | |
| tree | 8be6c2e72c796c481906978565bc116661e4fe9a /ext/json/generator/generator.h | |
| parent | f1194eb9b08b7c7be39e168c1f9620e377bee472 (diff) | |
* ext/json: merge JSON 1.7.7.
This includes security fix. [CVE-2013-0269]
https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json/generator/generator.h')
| -rw-r--r-- | ext/json/generator/generator.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h index 7d429d512c..b58cc4bc2f 100644 --- a/ext/json/generator/generator.h +++ b/ext/json/generator/generator.h @@ -2,7 +2,6 @@ #define _GENERATOR_H_ #include <string.h> -#include <assert.h> #include <math.h> #include <ctype.h> @@ -14,6 +13,14 @@ #include "re.h" #endif +#ifndef rb_intern_str +#define rb_intern_str(string) SYM2ID(rb_str_intern(string)) +#endif + +#ifndef rb_obj_instance_variables +#define rb_obj_instance_variables(object) rb_funcall(object, rb_intern("instance_variables"), 0) +#endif + #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key)) /* unicode defintions */ |