frame.c: Make ast_frame_free()/ast_frfree() NULL tolerant

Change-Id: Ic49d821ef88ada38a31bdd835b9531443c55d793
9 years ago · f66a8d6b97
parent 6c84a1edd9
commit f66a8d6b97
1 changed files with 4 additions and 6 deletions
--- a/main/frame.c
+++ b/main/frame.c
@ -163,18 +163,16 @@ void ast_frame_free(struct ast_frame *frame, int cache)
 {
 	struct ast_frame *next;

-	for (next = AST_LIST_NEXT(frame, frame_list);
-	     frame;
-	     frame = next, next = frame ? AST_LIST_NEXT(frame, frame_list) : NULL) {
+	while (frame) {
+		next = AST_LIST_NEXT(frame, frame_list);
 		__frame_free(frame, cache);
+		frame = next;
 	}
 }

 void ast_frame_dtor(struct ast_frame *f)
 {
-	if (f) {
-		ast_frfree(f);
-	}
+	ast_frfree(f);
 }

 /*!