From a1fcf6f7b28caf8e2f9b808449c86515e2ef90c4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Sat, 14 Nov 2015 09:02:10 -0400 Subject: [PATCH] hashtab: Add NULL check when destroying iterator. The hashtab API is pretty NULL tolerant which has resulted in remaining callers not doing much checks themselves. Unfortunately the function to destroy an iterator does not do a NULL check and will result in a crash if passed NULL. This change fixes that. ASTERISK-25552 #close Change-Id: Ic1bf8eec3639e5a440f1c941d3ae3893ac6ed619 --- main/hashtab.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main/hashtab.c b/main/hashtab.c index c08880c69c..5d54fb7aa3 100644 --- a/main/hashtab.c +++ b/main/hashtab.c @@ -746,6 +746,8 @@ struct ast_hashtab_iter *ast_hashtab_start_write_traversal(struct ast_hashtab *t void ast_hashtab_end_traversal(struct ast_hashtab_iter *it) { + if (!it) + return; if (it->tab->do_locking) ast_rwlock_unlock(&it->tab->lock); free(it);