Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsonparser: Don't treat \0 as eof

Browse Source 
Instead, treat it as regular part of the data and emit errors when we
encounter it.
This commit is contained in:
Benjamin Otte
2021-12-05 18:06:02 +01:00
parent a7a3ec8a16
commit 670286eb9e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/json/gtkjsonparser.c
View File

@@ -393,7 +393,7 @@ gtk_json_parser_schema_error (GtkJsonParser *self,
static gboolean
gtk_json_parser_is_eof (GtkJsonParser *self)
{
return self->reader >= self->end || *self->reader == '\0';
return self->reader >= self->end;
}
static gsize
@@ -900,6 +900,8 @@ gtk_json_parser_parse_value (GtkJsonParser *self)
end++;
gtk_json_parser_syntax_error_at (self, self->block->value, end, "Numbers may not start with '%c'", *self->block->value);
}
else if (*self->reader == 0)
gtk_json_parser_syntax_error (self, "Unexpected nul byte in document");
else
gtk_json_parser_syntax_error (self, "Expected a value");
return FALSE;
@@ -1070,10 +1072,10 @@ gtk_json_parser_next (GtkJsonParser *self)
if (gtk_json_parser_is_eof (self))
{
self->block->value = NULL;
if (gtk_json_parser_remaining (self))
{
gtk_json_parser_syntax_error (self, "Unexpected nul byte in document");
}
}
else if (*self->reader == 0)
{
gtk_json_parser_syntax_error (self, "Unexpected nul byte in document");
}
else
{