device-manager: Fix to avoid assertion if the device type is not valid 73/183473/1
authorSangchul Lee <sc11.lee@samsung.com>
Thu, 5 Jul 2018 03:15:41 +0000 (12:15 +0900)
committerSangchul Lee <sc11.lee@samsung.com>
Thu, 5 Jul 2018 23:55:18 +0000 (08:55 +0900)
[Version] 11.1.14
[Issue Type] Enhancement

Change-Id: I20fac43a9fee73eb20fcbf309c0c6a9bbc6bdd34
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
packaging/pulseaudio-modules-tizen.spec
src/device-manager.c

index cf990b4..1fcd27b 100644 (file)
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          11.1.13
+Version:          11.1.14
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
index c1eec03..4c4da25 100644 (file)
@@ -2454,12 +2454,14 @@ fail:
 static int handle_device_status_changed(pa_device_manager *dm, const char *type,
         const char *name, const char *system_id, device_detected_type_t detected) {
     pa_assert(dm);
-    pa_assert(device_type_is_valid(type));
 
     pa_log_info("Device Status Changed, type(%s) system_id(%s), detected_type(%d)",
             type, pa_strempty(system_id), detected);
 
-    if (device_type_is_equal(type, DEVICE_TYPE_BT_SCO)) {
+    if (!device_type_is_valid(type)) {
+        pa_log_error("Invalid device type %s", type);
+        return -1;
+    } else if (device_type_is_equal(type, DEVICE_TYPE_BT_SCO)) {
         _device_set_detected(dm, type, name, system_id, detected);
         if (detected == DEVICE_DISCONNECTED)
             handle_device_disconnected(dm, type, system_id);