[Tizen] Fix to memory leak in clipboard-impl-ecore-wl 05/174305/2 accepted/tizen/unified/20180405.064346 submit/tizen/20180402.083306 submit/tizen/20180403.133913
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 30 Mar 2018 02:05:53 +0000 (11:05 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 30 Mar 2018 02:24:39 +0000 (11:24 +0900)
- Variable 'reply' is allocated from 'eldbus_proxy_send_and_block()'.
- Added to eldbus_message_unref(reply) for memory free.

Change-Id: I781ae2fadd7180ae44f15e822d40b956e59171c2
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
dali/internal/clipboard/tizen-wayland/ecore-wl/clipboard-impl-ecore-wl.cpp
dali/internal/clipboard/tizen-wayland/ecore-wl2/clipboard-impl-ecore-wl2.cpp

index 4580e66..821a730 100644 (file)
@@ -162,6 +162,10 @@ struct Clipboard::Impl
       DALI_LOG_ERROR("Unable to call method org.freedesktop.DBus.Properties.Get: %s %s",
       errname, errmsg);
       eldbus_message_unref(req);
       DALI_LOG_ERROR("Unable to call method org.freedesktop.DBus.Properties.Get: %s %s",
       errname, errmsg);
       eldbus_message_unref(req);
+      if( reply )
+      {
+        eldbus_message_unref(reply);
+      }
       return -1;
     }
 
       return -1;
     }
 
@@ -169,10 +173,12 @@ struct Clipboard::Impl
     {
       DALI_LOG_ERROR("Cannot get arguments from eldbus");
       eldbus_message_unref(req);
     {
       DALI_LOG_ERROR("Cannot get arguments from eldbus");
       eldbus_message_unref(req);
+      eldbus_message_unref(reply);
       return -1;
     }
 
     eldbus_message_unref(req);
       return -1;
     }
 
     eldbus_message_unref(req);
+    eldbus_message_unref(reply);
     DALI_LOG_ERROR("cbhm item count(%d)", count);
     return count;
   }
     DALI_LOG_ERROR("cbhm item count(%d)", count);
     return count;
   }
index 8bcf344..309a07a 100644 (file)
@@ -160,6 +160,10 @@ struct Clipboard::Impl
       DALI_LOG_ERROR("Unable to call method org.freedesktop.DBus.Properties.Get: %s %s",
       errname, errmsg);
       eldbus_message_unref(req);
       DALI_LOG_ERROR("Unable to call method org.freedesktop.DBus.Properties.Get: %s %s",
       errname, errmsg);
       eldbus_message_unref(req);
+      if( reply )
+      {
+        eldbus_message_unref(reply);
+      }
       return -1;
     }
 
       return -1;
     }
 
@@ -167,10 +171,12 @@ struct Clipboard::Impl
     {
       DALI_LOG_ERROR("Cannot get arguments from eldbus");
       eldbus_message_unref(req);
     {
       DALI_LOG_ERROR("Cannot get arguments from eldbus");
       eldbus_message_unref(req);
+      eldbus_message_unref(reply);
       return -1;
     }
 
     eldbus_message_unref(req);
       return -1;
     }
 
     eldbus_message_unref(req);
+    eldbus_message_unref(reply);
     DALI_LOG_ERROR("cbhm item count(%d)", count);
     return count;
   }
     DALI_LOG_ERROR("cbhm item count(%d)", count);
     return count;
   }