Changeset 29ff5c2 for lib/json.c


Ignore:
Timestamp:
2015-11-21T00:01:50Z (5 years ago)
Author:
dequis <dx@…>
Parents:
e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/json.c

    re4f08bf r29ff5c2  
    509509                                case ']':
    510510
    511                                         if (top->type == json_array) {
     511                                        if (top && top->type == json_array) {
    512512                                                flags = (flags & ~(flag_need_comma | flag_seek_value)) | flag_next;
    513513                                        } else {              sprintf(error, "%d:%d: Unexpected ]", cur_line, e_off);
Note: See TracChangeset for help on using the changeset viewer.