Fix a bug in dbus::Bus::AddFilterFunction().

dbus/object_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 106 matching lines @@
                                         this,
                                         interface_name,
                                         signal_name,
                                         signal_callback,
                                         on_connected_callback));
 }
 
 void ObjectProxy::Detach() {
   bus_->AssertOnDBusThread();
 
-  if (filter_added_)
-    bus_->RemoveFilterFunction(&ObjectProxy::HandleMessageThunk, this);
+  if (filter_added_) {
+    if (!bus_->RemoveFilterFunction(&ObjectProxy::HandleMessageThunk, this)) {
+      LOG(ERROR) << "Failed to remove filter function";
+    }
+  }
 
   for (size_t i = 0; i < match_rules_.size(); ++i) {
     ScopedDBusError error;
     bus_->RemoveMatch(match_rules_[i], error.get());
     if (error.is_set()) {
       // There is nothing we can do to recover, so just print the error.
       LOG(ERROR) << "Failed to remove match rule: " << match_rules_[i];
     }
   }
 }
@@ skipping 131 matching lines @@
     return;
   }
 
   // Will become true, if everything is successful.
   bool success = false;
 
   if (bus_->Connect() && bus_->SetUpAsyncOperations()) {
     // We should add the filter only once. Otherwise, HandleMessage() will
     // be called more than once.
     if (!filter_added_) {
-      bus_->AddFilterFunction(&ObjectProxy::HandleMessageThunk, this);
-      filter_added_ = true;
+      if (bus_->AddFilterFunction(&ObjectProxy::HandleMessageThunk, this)) {
+        filter_added_ = true;
+      } else {
+        LOG(ERROR) << "Failed to add filter function";
+      }
     }
     // Add a match rule so the signal goes through HandleMessage().
     //
     // We don't restrict the sender object path to be |object_path_| here,
     // to make it easy to test D-Bus signal handling with dbus-send, that
     // uses "/" as the sender object path. We can make the object path
     // restriction customizable when it becomes necessary.
     const std::string match_rule =
         base::StringPrintf("type='signal', interface='%s'",
                            interface_name.c_str());
@@ skipping 94 matching lines @@
 
 DBusHandlerResult ObjectProxy::HandleMessageThunk(
     DBusConnection* connection,
     DBusMessage* raw_message,
     void* user_data) {
   ObjectProxy* self = reinterpret_cast<ObjectProxy*>(user_data);
   return self->HandleMessage(connection, raw_message);
 }
 
 }  // namespace dbus