From aa9764463a1607cf13d6589e4fa9752920367179 Mon Sep 17 00:00:00 2001 From: "tsepez@chromium.org" Date: Wed, 25 Apr 2012 20:20:19 +0000 Subject: NOTREACHED() in VarTracker::ReleaseVar() can be reached. Remove it. Because PPB_Var_Deprecated_Proxy::OnMsgReleaseObject() can defer a ReleaseVar() call past the time an instance is destroyed, and because as part of instance destruction HostVarTracker::ForceReleaseNPObject() forcibly zeroes a variable's ref_count and deletes it, the deferred ReleaseVar() call will hit this path frequently and blow up the debugger. Review URL: https://chromiumcodereview.appspot.com/10227009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133968 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/shared_impl/var_tracker.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ppapi') diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc index a564fed..8214a30 100644 --- a/ppapi/shared_impl/var_tracker.cc +++ b/ppapi/shared_impl/var_tracker.cc @@ -94,10 +94,8 @@ bool VarTracker::ReleaseVar(int32 var_id) { DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR)) << var_id << " is not a PP_Var ID."; VarMap::iterator found = live_vars_.find(var_id); - if (found == live_vars_.end()) { - NOTREACHED() << "Unref-ing an invalid var"; + if (found == live_vars_.end()) return false; - } VarInfo& info = found->second; if (info.ref_count == 0) { -- cgit v1.1