kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't deref NULL. Found by Klockwork (www.klocwork.com) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8512 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-05-21 22:00:30 +00:00
parent 9972dc42ec
commit 2c19360e0d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -740,13 +740,13 @@ SWITCH_STANDARD_APP(fifo_function)
pop = NULL; pop = NULL;
if (moh && do_wait) { if (moh && do_wait) {
switch_status_t status = switch_ivr_play_file(session, NULL, moh, &args); switch_status_t moh_status = switch_ivr_play_file(session, NULL, moh, &args);
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.read_frame_callback = consumer_read_frame_callback; args.read_frame_callback = consumer_read_frame_callback;
args.user_data = node_list; args.user_data = node_list;
switch_ivr_play_file(session, NULL, moh, &args); switch_ivr_play_file(session, NULL, moh, &args);
if (!SWITCH_READ_ACCEPTABLE(status)) { if (!SWITCH_READ_ACCEPTABLE(moh_status)) {
break; break;
} }
} }
@ -1153,13 +1153,13 @@ SWITCH_STANDARD_API(fifo_api_function)
if (!x) { if (!x) {
stream->write_function(stream, "none\n"); stream->write_function(stream, "none\n");
} }
} else { } else if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) {
if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) { len = node_consumer_wait_count(node);
len = node_consumer_wait_count(node);
}
switch_mutex_lock(node->mutex); switch_mutex_lock(node->mutex);
stream->write_function(stream, "%s:%d:%d:%d\n", argv[1], node->consumer_count, node->caller_count, len); stream->write_function(stream, "%s:%d:%d:%d\n", argv[1], node->consumer_count, node->caller_count, len);
switch_mutex_unlock(node->mutex); switch_mutex_unlock(node->mutex);
} else {
stream->write_function(stream, "none\n");
} }
} }