Sync with 3.0 : Ver. 1.4.17 to 1.4.19

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

diff --git a/packaging/mtp-initiator.spec b/packaging/mtp-initiator.spec
index 3af0570debcea995ed7f8d2ac41e7b61fed8f8fe..aaf3409f92452bf076bb06152b2db02d4a1e87f8 100755 (executable)
--- a/packaging/mtp-initiator.spec
+++ b/packaging/mtp-initiator.spec
@@ -1,6 +1,6 @@
 Name:       mtp-initiator
 Summary:    mtp(media transfer protocol) initiator
-Version:    1.4.17
+Version:    1.4.19
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
@@ -60,6 +60,7 @@ install -D -m 0644 packaging/mtp-initiator.service %{buildroot}/%{_unitdir}/mtp-
 
 %files
 %manifest %{name}.manifest
+%license LICENSE.APLv2
 %defattr(-,root,root,-)
 %{_bindir}/mtp-initiator
 %{_unitdir}/mtp-initiator.service

diff --git a/src/daemon/mtp_daemon_event.c b/src/daemon/mtp_daemon_event.c
index fcdcfcdd96fec07609c14912142aaf95181c9447..9fb1cf1d286c77cd975cbefffaf08be8112da74a 100755 (executable)
--- a/src/daemon/mtp_daemon_event.c
+++ b/src/daemon/mtp_daemon_event.c
@@ -391,6 +391,8 @@ static void* __event_thread(gpointer dev, gpointer data)
                                                mtp_daemon_db_insert(device_id, object_info->StorageID, param1, object_info, mtp_ctx);
                                        }
                                }
+
+                               g_free(object_info);
                        }
                        mtp_daemon_gdbus_emit_event(device_event, (int)param1, mtp_ctx);
                }

diff --git a/src/daemon/mtp_daemon_gdbus_manager.c b/src/daemon/mtp_daemon_gdbus_manager.c
index 12e4955b77dc5d674a1d72bc6a4fa3536c36b669..88abbe4a3f8b053433f27cc15a8a9edfd683b624 100755 (executable)
--- a/src/daemon/mtp_daemon_gdbus_manager.c
+++ b/src/daemon/mtp_daemon_gdbus_manager.c
@@ -217,8 +217,11 @@ static void __manager_get_object_handles_thread_func(gpointer user_data)
 
                if (object_info->StorageID != mtp_storage) {
                        MTP_LOGE("Not Equal between real object storage id and parameter");
+                       g_free(object_info);
                        goto END;
                }
+
+               g_free(object_info);
        }
 
        ret = LIBMTP_Get_Object_Handles(device, (uint32_t)mtp_storage,
@@ -362,7 +365,7 @@ static void __manager_get_partial_object_thread_func(gpointer user_data)
        int offset;
        int max_bytes;
        char *dest_path;
-       unsigned int actual_written;
+       unsigned int actual_written = 0;
        unsigned char *data;
 
        /* check precondition */