Commit e223f08a authored Nov 19, 2019 by Jon Spivack

Fix iterator in ServiceManager::removeCallback

The pointer to the iterator in this function wasn't properly dereferenced, leading to an inifinite loop in ServiceManager::binderDied.

Bug: 144534962
Test: Manual (boot and dynamically start services)
Change-Id: Ie7b8685b5de31ab7c9ba5877b6df3af08aab0c0f

parent b5667012

cmds/servicemanager/ServiceManager.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ void ServiceManager::removeCallback(const wp<IBinder>& who,
		if (listeners.empty()) {
		it = mNameToCallback.erase(it);
		} else {
		it++;
		(*it)++;
		}
		}