Merge pull request json-c#879 from janotomko/null

hawicz · web-flow · commit 961c31f8edd8 · 2024-12-07T13:33:05.000-05:00
Handle NULL gracefully in json_tokener_free
diff --git a/json_tokener.c b/json_tokener.c
@@ -185,6 +185,8 @@ struct json_tokener *json_tokener_new(void)
 
 void json_tokener_free(struct json_tokener *tok)
 {
+	if (!tok)
+		return;
 	json_tokener_reset(tok);
 	if (tok->pb)
 		printbuf_free(tok->pb);

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,8 @@ struct json_tokener *json_tokener_new(void)`
`185`	`185`
`186`	`186`	`void json_tokener_free(struct json_tokener *tok)`
`187`	`187`	`{`
	`188`	`+ if (!tok)`
	`189`	`+ return;`
`188`	`190`	`json_tokener_reset(tok);`
`189`	`191`	`if (tok->pb)`
`190`	`192`	`printbuf_free(tok->pb);`