Handle NULL gracefully in json_tokener_free

janotomko · janotomko · commit 828c12b22661 · 2024-11-06T15:23:00.000+01:00
Similarly to glibc's free, make json_tokener_free(NULL)
a no-op, to simplify cleanup paths.

Signed-off-by: Ján Tomko &lt;jtomko@redhat.com&gt;
diff --git a/json_tokener.c b/json_tokener.c
@@ -182,6 +182,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
`@@ -182,6 +182,8 @@ struct json_tokener *json_tokener_new(void)`
`182`	`182`
`183`	`183`	`void json_tokener_free(struct json_tokener *tok)`
`184`	`184`	`{`
	`185`	`+ if (!tok)`
	`186`	`+ return;`
`185`	`187`	`json_tokener_reset(tok);`
`186`	`188`	`if (tok->pb)`
`187`	`189`	`printbuf_free(tok->pb);`