]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Skinny: some columns may be null: avoid segfault
authorMathieu Parent <math.parent@gmail.com>
Tue, 28 Jun 2011 22:23:54 +0000 (00:23 +0200)
committerMathieu Parent <math.parent@gmail.com>
Tue, 28 Jun 2011 22:25:32 +0000 (00:25 +0200)
See FS-3379

src/mod/endpoints/mod_skinny/mod_skinny.c

index 3b07472e7ed08313c083429770d5c3f365e30510..317833f9f3b790fb4ff45caaa7139ad4b3fd805b 100644 (file)
@@ -1334,11 +1334,17 @@ static int dump_device_callback(void *pArg, int argc, char **argv, char **column
        stream->write_function(stream, "Port          \t%s\n", port);
        stream->write_function(stream, "Codecs        \t%s\n", codec_string);
        stream->write_function(stream, "HeadsetId     \t%s\n", headset);
-       stream->write_function(stream, "Headset       \t%s\n", skinny_accessory_state2str(atoi(headset)));
+       if (headset) {
+               stream->write_function(stream, "Headset       \t%s\n", skinny_accessory_state2str(atoi(headset)));
+       }
        stream->write_function(stream, "HandsetId     \t%s\n", handset);
-       stream->write_function(stream, "Handset       \t%s\n", skinny_accessory_state2str(atoi(handset)));
+       if (handset) {
+               stream->write_function(stream, "Handset       \t%s\n", skinny_accessory_state2str(atoi(handset)));
+       }
        stream->write_function(stream, "SpeakerId     \t%s\n", speaker);
-       stream->write_function(stream, "Speaker       \t%s\n", skinny_accessory_state2str(atoi(speaker)));
+       if (speaker) {
+               stream->write_function(stream, "Speaker       \t%s\n", skinny_accessory_state2str(atoi(speaker)));
+       }
        stream->write_function(stream, "%s\n", line);
 
        return 0;