summaryrefslogtreecommitdiff
path: root/ext/json/ext/generator/generator.c
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-02-25 10:27:44 +0100
committerFlorian Frank <flori@ping.de>2016-02-25 10:27:44 +0100
commit8883a51ec7a56cd8bda87ab2c82924a90d7aa782 (patch)
treee4804afa8c639993f5ef4e872e201cad3a843c44 /ext/json/ext/generator/generator.c
parentbf8ef07bf3cf0fe7126b029b888e4054116c7c09 (diff)
parent4922d2ae6cf93d14f7d51d416f518b5945935b3a (diff)
downloadjson-8883a51ec7a56cd8bda87ab2c82924a90d7aa782.tar.gz
Merge branch 'v1.8'
Diffstat (limited to 'ext/json/ext/generator/generator.c')
-rw-r--r--ext/json/ext/generator/generator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
index 0a3e920..393e29c 100644
--- a/ext/json/ext/generator/generator.c
+++ b/ext/json/ext/generator/generator.c
@@ -871,7 +871,7 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
} else {
tmp = rb_funcall(obj, i_to_s, 0);
Check_Type(tmp, T_STRING);
- generate_json(buffer, Vstate, state, tmp);
+ generate_json_string(buffer, Vstate, state, tmp);
}
}