Fix crash issue and change path for x86_64 emulator binary

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

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 023add134cfa4325bd08bd083713ef535a2412d5..806517a59ee7c74698e8f2e7957fcfe53c7c39a7 100755 (executable)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -92,12 +92,12 @@ LDFLAGS="$LDFLAGS" cmake . \
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-cp -af %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
-cp -af %{SOURCE2} %{buildroot}%{_libdir}/systemd/system/
+mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+cp -af %{SOURCE1} %{buildroot}/usr/lib/systemd/system/
+cp -af %{SOURCE2} %{buildroot}/usr/lib/systemd/system/
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s ../%{name}.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/%{name}.service
+mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/%{name}.service
 
 install -D -m 0644 LICENSE.Flora  %{buildroot}/%{_datadir}/license/nfc-common-lib
 install -D -m 0644 LICENSE.Flora  %{buildroot}/%{_datadir}/license/%{name}
@@ -147,9 +147,9 @@ systemctl daemon-reload
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/nfc-manager-daemon
-%{_libdir}/systemd/system/%{name}.service
-%{_libdir}/systemd/system/%{name}.socket
-%{_libdir}/systemd/system/multi-user.target.wants/%{name}.service
+/usr/lib/systemd/system/%{name}.service
+/usr/lib/systemd/system/%{name}.socket
+/usr/lib/systemd/system/multi-user.target.wants/%{name}.service
 %{_datadir}/dbus-1/system-services/org.tizen.NetNfcService.service
 %{_datadir}/license/%{name}
 

diff --git a/src/manager/net_nfc_server_snep.c b/src/manager/net_nfc_server_snep.c
index cc79b0507d33c956b66dc0fb86be9580f957bdca..31019cfa4c6e15d74602d7f7ae55b06967a23818 100755 (executable)
--- a/src/manager/net_nfc_server_snep.c
+++ b/src/manager/net_nfc_server_snep.c
@@ -835,7 +835,6 @@ static void snep_register_server_thread_func(gpointer user_data)
        g_free(arg_san);
 
        g_object_unref(invocation);
-       g_object_unref(object);
 
        g_variant_unref(user_data);
 }