ast: fix potential null pointer deref in ut_free()

Extend the existing `s != NULL` conditional to cover all state pointer
accesses.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

1 files changed, 20 insertions, 20 deletions

diff --git a/ast.c b/ast.c
index 6c9d2da..4818ee9 100644
--- a/ast.c
+++ b/ast.c
@@ -538,34 +538,34 @@ ut_free(struct ut_state *s)
 		s->poolsize = 0;
 
 		ut_reset(s);
-	}
-
-	while (ut_ext_types_count > 0)
-		json_object_put(ut_ext_types[--ut_ext_types_count].proto);
 
-	json_object_put(s->rval);
+		json_object_put(s->rval);
 
-	for (sc = s->scopelist; sc; sc = sc->next) {
-		scj = sc->scope;
-		sc->scope = NULL;
-		json_object_put(scj);
-	}
+		for (sc = s->scopelist; sc; sc = sc->next) {
+			scj = sc->scope;
+			sc->scope = NULL;
+			json_object_put(scj);
+		}
 
-	for (sc = s->scopelist; sc; sc = sc_next) {
-		sc_next = sc->next;
-		free(sc);
-	}
+		for (sc = s->scopelist; sc; sc = sc_next) {
+			sc_next = sc->next;
+			free(sc);
+		}
 
-	for (src = s->sources; src; src = src_next) {
-		src_next = src->next;
+		for (src = s->sources; src; src = src_next) {
+			src_next = src->next;
 
-		if (src->fp)
-			fclose(src->fp);
+			if (src->fp)
+				fclose(src->fp);
 
-		free(src->filename);
-		free(src);
+			free(src->filename);
+			free(src);
+		}
 	}
 
+	while (ut_ext_types_count > 0)
+		json_object_put(ut_ext_types[--ut_ext_types_count].proto);
+
 	free(ut_ext_types);
 	free(s);
 }