]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
don't deref NULL. Found by Klockwork (www.klocwork.com)
authorMichael Jerris <mike@jerris.com>
Wed, 21 May 2008 22:00:30 +0000 (22:00 +0000)
committerMichael Jerris <mike@jerris.com>
Wed, 21 May 2008 22:00:30 +0000 (22:00 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8512 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_fifo/mod_fifo.c

index 78676f0492f3f72e11e7e35f6950a0d86ad17310..5e429a39a396cbdfbec2d3c928e3cb37e3139ac5 100644 (file)
@@ -740,13 +740,13 @@ SWITCH_STANDARD_APP(fifo_function)
                        pop = NULL;
                        
             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));
                 args.read_frame_callback = consumer_read_frame_callback;
                 args.user_data = node_list;
                 switch_ivr_play_file(session, NULL, moh, &args);
                                
-                               if (!SWITCH_READ_ACCEPTABLE(status)) {
+                               if (!SWITCH_READ_ACCEPTABLE(moh_status)) {
                                        break;
                                }
             }
@@ -1153,13 +1153,13 @@ SWITCH_STANDARD_API(fifo_api_function)
             if (!x) {
                 stream->write_function(stream, "none\n");
             }
-        } else {
-            if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) {
-                               len = node_consumer_wait_count(node);
-            }
+        } else if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) {
+                       len = node_consumer_wait_count(node);
             switch_mutex_lock(node->mutex);
             stream->write_function(stream, "%s:%d:%d:%d\n", argv[1], node->consumer_count, node->caller_count, len);
             switch_mutex_unlock(node->mutex);
+               } else {
+                       stream->write_function(stream, "none\n");
         }
     }