diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-23 16:20:04 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-23 16:20:04 -0800 |
| commit | 08987e3dd4159cf7d1d303a81fd38c5e02a44557 (patch) | |
| tree | 8f8123f2a41c4cee2f39cd9fe7d4954bb4ed8183 /upb/json/parser.c | |
| parent | aa2d5a609bc714e90300f26e04e729a4822a2aa5 (diff) | |
| parent | 87b59f445b7be42685491b816416a4e360e30b33 (diff) | |
Merge branch 'master' into arrayapi
Diffstat (limited to 'upb/json/parser.c')
| -rw-r--r-- | upb/json/parser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/upb/json/parser.c b/upb/json/parser.c index 83590a1..08056d3 100644 --- a/upb/json/parser.c +++ b/upb/json/parser.c @@ -1301,15 +1301,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), |