diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 16:20:59 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2018-12-22 16:20:59 -0800 |
| commit | 4267380b67e93165fca8f5b9b626a2f2e1bcefa3 (patch) | |
| tree | bb8d9e959f8c2ef9159cb33c8118bb7fb48ea2d8 /upb/json/parser.c | |
| parent | 8afe0b03a349cc259fb731ff2d2e0a13e47c166a (diff) | |
| parent | 161258a2adeaffd4e2cd5ab4ea370224e618ec95 (diff) | |
Merge branch 'master' into defcleanup
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 85919e7..90a401d 100644 --- a/upb/json/parser.c +++ b/upb/json/parser.c @@ -1297,15 +1297,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), |