From afd8dad4e700c4958858aa6f55a5644ffbdaf5f2 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Wed, 29 Jun 2011 00:23:54 +0200 Subject: [PATCH] Skinny: some columns may be null: avoid segfault See FS-3379 --- src/mod/endpoints/mod_skinny/mod_skinny.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c index 3b07472e7e..317833f9f3 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.c +++ b/src/mod/endpoints/mod_skinny/mod_skinny.c @@ -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;