Merge pull request #12 from jniewerth/patch-1

Fix Segfault when ALSA device has no description
badaix · Nov 15, 2015 · b4a2389 · b4a2389
2 parents da58cb5 + 8593cd8
commit b4a2389
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/client/alsaPlayer.cpp b/client/alsaPlayer.cpp
@@ -227,7 +227,11 @@ vector<PcmDevice> Player::pcm_list(void)
 		if (io != NULL && strcmp(io, "Output") != 0)
 			goto __end;
 		pcmDevice.name = name;
-		pcmDevice.description = descr;
+		if(descr == NULL) {
+			pcmDevice.description = "";
+		} else {
+			pcmDevice.description = descr;
+		}
 		pcmDevice.idx = idx++;
 		result.push_back(pcmDevice);