diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-12-19 12:24:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 12:24:54 -0800 |
| commit | 161258a2adeaffd4e2cd5ab4ea370224e618ec95 (patch) | |
| tree | 7b4172b89d9d88f2922100f8dca2768aa04fb13f /upb/json/parser.c | |
| parent | 2c0e0054a85651ff20067ec504844a4611097041 (diff) | |
| parent | 18563bee4c9822a1ee42bb1d93024981777eea41 (diff) | |
Merge pull request #142 from TeBoring/json-any-encoding
Add support for encoding Any in json
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), |