Fix logic when request storage_id is empty string 14/99414/1
authorMinje Ahn <minje.ahn@samsung.com>
Wed, 23 Nov 2016 00:13:04 +0000 (09:13 +0900)
committerMinje Ahn <minje.ahn@samsung.com>
Wed, 23 Nov 2016 00:13:04 +0000 (09:13 +0900)
Change-Id: Ifb5f38285ab5bd11f1d400cb55c843caa599e7d8
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
packaging/media-server.spec
src/scanner/media-scanner-scan.c

index 7f66d02..7980a8d 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.15
+Version:    0.3.16
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
index 3be12d7..ac68490 100755 (executable)
@@ -500,10 +500,14 @@ gboolean msc_directory_scan_thread(void *data)
 
                scan_type = scan_data->msg_type;
 
-               if (strlen(scan_data->storage_id) > 0)
+               if (strlen(scan_data->storage_id) > 0) {
+                       /*MS_DBG("path : [%s], storage_id : [%s]", scan_data->msg, scan_data->storage_id);*/
                        storage_id = strdup(scan_data->storage_id);
-               else
-                       storage_id = strdup("media");
+               } else {
+                       MS_DBG_ERR("storage_id length is 0. There is no information of your request [%s]", scan_data->msg);
+                       ret = MS_MEDIA_ERR_INVALID_PARAMETER;
+                       goto NEXT;
+               }
 
                if (storage_id == NULL) {
                        MS_DBG_ERR("storage_id NULL");