Skinny: some columns may be null: avoid segfault

See FS-3379
This commit is contained in:
Mathieu Parent 2011-06-29 00:23:54 +02:00
parent 22d8994325
commit afd8dad4e7
1 changed files with 9 additions and 3 deletions

View 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;