Index: base/callback_registry.h |
diff --git a/base/callback_registry.h b/base/callback_registry.h |
index b0310dfd8c26927b10e672b345a61c6e50a28ae3..fcacbf549f2a79412130e0b1d902715a9663cca0 100644 |
--- a/base/callback_registry.h |
+++ b/base/callback_registry.h |
@@ -125,9 +125,11 @@ class CallbackRegistryBase { |
while ((list_iter_ != list_->callbacks_.end()) && list_iter_->is_null()) |
++list_iter_; |
- CallbackType* cb = |
- list_iter_ != list_->callbacks_.end() ? &(*list_iter_) : NULL; |
- ++list_iter_; |
+ CallbackType* cb = NULL; |
+ if (list_iter_ != list_->callbacks_.end()) { |
+ cb = &(*list_iter_); |
+ ++list_iter_; |
+ } |
return cb; |
} |