Fix crash issue

- create dummy data for null parameter

Change-Id: I9619f41b8a179383143ffaf52b29eb1c376f53b7
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/src/daemon/mtp_daemon_gdbus_deviceinfo.c b/src/daemon/mtp_daemon_gdbus_deviceinfo.c
index ceb9c351b6b025dc6ae25cd02fe807739eef7094..1f4da9406f45f93edc1c5e6a065209b6e461462b 100644 (file)
--- a/src/daemon/mtp_daemon_gdbus_deviceinfo.c
+++ b/src/daemon/mtp_daemon_gdbus_deviceinfo.c
@@ -365,7 +365,7 @@ OUT:
        }
 
        mtp_gdbuslib_deviceinfo_complete_get_manufacturer_name(deviceinfo,
-               invocation, 0, result);
+               invocation, "N/A", result);
 
        return TRUE;
 }
@@ -416,7 +416,7 @@ OUT:
                /* LCOV_EXCL_STOP */
        }
 
-       mtp_gdbuslib_deviceinfo_complete_get_model_name(deviceinfo, invocation, 0, result);
+       mtp_gdbuslib_deviceinfo_complete_get_model_name(deviceinfo, invocation, "N/A", result);
 
        return TRUE;
 }
@@ -467,7 +467,7 @@ OUT:
                /* LCOV_EXCL_STOP */
        }
 
-       mtp_gdbuslib_deviceinfo_complete_get_serial_number(deviceinfo, invocation, 0, result);
+       mtp_gdbuslib_deviceinfo_complete_get_serial_number(deviceinfo, invocation, "N/A", result);
 
        return TRUE;
 }
@@ -518,7 +518,7 @@ OUT:
                /* LCOV_EXCL_STOP */
        }
 
-       mtp_gdbuslib_deviceinfo_complete_get_device_version(deviceinfo, invocation, 0, result);
+       mtp_gdbuslib_deviceinfo_complete_get_device_version(deviceinfo, invocation, "N/A", result);
 
        return TRUE;
 }
@@ -671,7 +671,7 @@ OUT:
                /* LCOV_EXCL_STOP */
        }
 
-       mtp_gdbuslib_deviceinfo_complete_get_stitching_engine_version(deviceinfo, invocation, 0, result);
+       mtp_gdbuslib_deviceinfo_complete_get_stitching_engine_version(deviceinfo, invocation, "N/A", result);
 
        return TRUE;
 }

diff --git a/src/daemon/mtp_daemon_gdbus_manager.c b/src/daemon/mtp_daemon_gdbus_manager.c
old mode 100755 (executable)
new mode 100644 (file)
index d2136a9..3262904
--- a/src/daemon/mtp_daemon_gdbus_manager.c
+++ b/src/daemon/mtp_daemon_gdbus_manager.c
@@ -22,6 +22,16 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+GVariant *__create_dummy_variant(const char *type) {
+    GVariantBuilder builder;
+    GVariant *gv;
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE(type));
+    gv = g_variant_builder_end(&builder);
+
+    return gv;
+}
+
 /* Manager */
 static void __manager_get_devices_thread_func(gpointer user_data)
 {
@@ -631,7 +641,9 @@ OUT:
                g_free(param);
        }
 
-       mtp_gdbuslib_manager_complete_get_devices(manager, invocation, 0, NULL, result);
+       GVariant *dummy = __create_dummy_variant("aa{sv}");
+
+       mtp_gdbuslib_manager_complete_get_devices(manager, invocation, 0, dummy, result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */
@@ -682,8 +694,10 @@ OUT:
                g_free(param);
        }
 
+       GVariant *dummy = __create_dummy_variant("aa{sv}");
+
        mtp_gdbuslib_manager_complete_get_storages(manager,
-               invocation, 0, NULL, result);
+               invocation, 0, dummy, result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */
@@ -740,8 +754,10 @@ OUT:
                g_free(param);
        }
 
+       GVariant *dummy = __create_dummy_variant("aa{sv}");
+
        mtp_gdbuslib_manager_complete_get_object_handles(manager,
-               invocation, 0, NULL, result);
+               invocation, 0, dummy, result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */

diff --git a/src/daemon/mtp_daemon_gdbus_objectinfo.c b/src/daemon/mtp_daemon_gdbus_objectinfo.c
old mode 100755 (executable)
new mode 100644 (file)
index f487658..b8fb396
--- a/src/daemon/mtp_daemon_gdbus_objectinfo.c
+++ b/src/daemon/mtp_daemon_gdbus_objectinfo.c
@@ -295,7 +295,7 @@ OUT:
        }
 
        mtp_gdbuslib_objectinfo_complete_get_property_string(objectinfo,
-               invocation, NULL, result);
+               invocation, "N/A", result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */

diff --git a/src/daemon/mtp_daemon_gdbus_storageinfo.c b/src/daemon/mtp_daemon_gdbus_storageinfo.c
index 4ee64478d5ab616e9c3795992054d83262f955eb..e242a9dc902ecd645ec1c633648dd959b50f39d8 100644 (file)
--- a/src/daemon/mtp_daemon_gdbus_storageinfo.c
+++ b/src/daemon/mtp_daemon_gdbus_storageinfo.c
@@ -302,7 +302,7 @@ OUT:
                g_free(param);
        }
 
-       mtp_gdbuslib_storageinfo_complete_get_description(storageinfo, invocation, 0, result);
+       mtp_gdbuslib_storageinfo_complete_get_description(storageinfo, invocation, "N/A", result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */
@@ -515,7 +515,7 @@ OUT:
        }
 
        mtp_gdbuslib_storageinfo_complete_get_volume_identifier(storageinfo,
-               invocation, 0, result);
+               invocation, "N/A", result);
 
        return TRUE;
        /* LCOV_EXCL_STOP */