summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2017-11-11 09:42:01 -0600
committerRichard Mudgett <rmudgett@digium.com>2017-11-11 14:04:40 -0500
commitf66a8d6b97e571bb9b86adeb254a4b3c6bc74635 (patch)
treea121b96fa966960660f6163526eecd626cf3c554
parent6c84a1edd9e2b80269ede1ea9da159adad868afa (diff)
frame.c: Make ast_frame_free()/ast_frfree() NULL tolerant
Change-Id: Ic49d821ef88ada38a31bdd835b9531443c55d793
-rw-r--r--main/frame.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/main/frame.c b/main/frame.c
index c24cc8f78..8a151eff8 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);
}
/*!