Svace Issue fix

Change-Id: I57726950d8d33e20e45ab2aa9bd28e307a2e22d5

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index d426d57..e9427c6 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.57
+Version:    0.3.58
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 6030244..b19617f 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1635,6 +1635,9 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re
                if (register_array->len != 0 && remain_request == 0) {
                        *register_data = g_array_index(register_array, ms_comm_msg_s*, 0);
                        g_array_remove_index(register_array, 0);
+                       if (*register_data == NULL)
+                               continue;
+
                        break;
                } else if (remain_request != 0) {
                        insert_data = g_async_queue_pop(reg_queue2);

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 5e4b157..2d368fc 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -621,6 +621,9 @@ static int __msc_pop_register_request(GArray *register_array, ms_comm_msg_s **re
                if (register_array->len != 0 && remain_request == 0) {
                        *register_data = g_array_index(register_array, ms_comm_msg_s*, 0);
                        g_array_remove_index(register_array, 0);
+                       if (*register_data == NULL)
+                               continue;
+
                        break;
                } else if (remain_request != 0) {
                        insert_data = g_async_queue_pop(reg_queue);