From b865d29f1ccfd23c1d975d9149777b0816d83b9e Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Sat, 11 Nov 2017 09:42:01 -0600
Subject: [PATCH] frame.c: Make ast_frame_free()/ast_frfree() NULL tolerant
Change-Id: Ic49d821ef88ada38a31bdd835b9531443c55d793
---
main/frame.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/main/frame.c b/main/frame.c
index c24cc8f786..8a151eff88 100644
--- 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);
}
/*!
--
GitLab