From b39dbb9d4010f6b6e11a5100a73e03b601cf72b9 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Wed, 12 Dec 2018 06:34:11 +0000 Subject: Add support for encoding Any in json --- upb/json/parser.rl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'upb/json/parser.rl') diff --git a/upb/json/parser.rl b/upb/json/parser.rl index a7bdb3f..e584515 100644 --- a/upb/json/parser.rl +++ b/upb/json/parser.rl @@ -1299,15 +1299,15 @@ static bool end_stringval_nontop(upb_json_parser *p) { return true; } - if (p->top->is_any) { - return end_any_stringval(p); - } - if (p->top->f == NULL) { multipart_end(p); return true; } + if (p->top->is_any) { + return end_any_stringval(p); + } + switch (upb_fielddef_type(p->top->f)) { case UPB_TYPE_BYTES: if (!base64_push(p, getsel_for_handlertype(p, UPB_HANDLER_STRING), -- cgit v1.2.3