Fix Dereference of null pointer found by Clang analyzer

Change-Id: I3e84e987ad26019d7536baf4d90d6b0c684f6ec1
Reviewed-on: https://code.wireshark.org/review/3054
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Alexis La Goutte 2014-07-15 08:47:40 +02:00 committed by Evan Huus
parent 53f597d120
commit b33f777350
1 changed files with 12 additions and 9 deletions

View File

@ -310,7 +310,8 @@ static int change_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_n
gchar *frame_label = NULL;
gchar *comment = NULL;
if(NULL!=tapinfo->graph_analysis->ht)
if(tapinfo->graph_analysis && NULL!=tapinfo->graph_analysis->ht)
gai=(seq_analysis_item_t *)g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num);
if(gai) {
frame_label = gai->frame_label;
@ -339,15 +340,17 @@ static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 ca
guint items_changed;
items_changed = 0;
list = g_queue_peek_nth_link(tapinfo->graph_analysis->items, 0);
while (list)
{
gai = (seq_analysis_item_t *)list->data;
if (gai->conv_num == call_num) {
gai->conv_num = new_call_num;
items_changed++;
if(tapinfo->graph_analysis){
list = g_queue_peek_nth_link(tapinfo->graph_analysis->items, 0);
while (list)
{
gai = (seq_analysis_item_t *)list->data;
if (gai->conv_num == call_num) {
gai->conv_num = new_call_num;
items_changed++;
}
list = g_list_next(list);
}
list = g_list_next(list);
}
return items_changed;
}