Merge "fix NPE in freeNode" (60f3e2ba) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/OMX.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,10 @@ status_t OMX::allocateNode(
		status_t OMX::freeNode(node_id node) {
		OMXNodeInstance *instance = findInstance(node);

		if (instance == NULL) {
		return OK;
		}

		{
		Mutex::Autolock autoLock(mLock);
		ssize_t index = mLiveNodes.indexOfKey(IInterface::asBinder(instance->observer()));