MT#60853 fix possible null dereference

rfuchs · rfuchs · commit 0af3750f9265 · 2024-09-10T10:32:01.000-04:00
Change-Id: I9d6b96ed10bab0055aa217fd976335a2e0919b56 (cherry picked from commit 3e0b302) (cherry picked from commit c85596a)
diff --git a/recording-daemon/metafile.c b/recording-daemon/metafile.c
@@ -34,6 +34,8 @@ static void meta_free(void *ptr) {
 	g_clear_pointer(&mf->ssrc_hash, g_hash_table_destroy);
 	for (int i = 0; i < mf->streams->len; i++) {
 		stream_t *stream = g_ptr_array_index(mf->streams, i);
+		if (!stream)
+			continue;
 		stream_close(stream); // should be closed already
 		stream_free(stream);
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ static void meta_free(void *ptr) {`
`34`	`34`	`g_clear_pointer(&mf->ssrc_hash, g_hash_table_destroy);`
`35`	`35`	`for (int i = 0; i < mf->streams->len; i++) {`
`36`	`36`	`stream_t *stream = g_ptr_array_index(mf->streams, i);`
	`37`	`+ if (!stream)`
	`38`	`+ continue;`
`37`	`39`	`stream_close(stream); // should be closed already`
`38`	`40`	`stream_free(stream);`
`39`	`41`	`}`