This is an archive of the discontinued LLVM Phabricator instance.

Avoid use-after-free in ~LegacyRTDyldObjectLinkingLayer
ClosedPublic

Authored by sanjoy on Jan 9 2019, 4:25 PM.

Reviewers

Commits

This is an obvious fix for a use-after-free. Looks good.

This revision is now accepted and ready to land.Jan 10 2019, 11:57 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

trunk/

include/

llvm/

ExecutionEngine/

Orc/

5 lines

Show First 20 Lines • Show All 437 Lines • ▼ Show 20 Lines	public:
Error emitAndFinalize(VModuleKey K) {		Error emitAndFinalize(VModuleKey K) {
assert(LinkedObjects.count(K) && "VModuleKey not associated with object");		assert(LinkedObjects.count(K) && "VModuleKey not associated with object");
return LinkedObjects[K]->finalize();		return LinkedObjects[K]->finalize();
}		}

private:		private:
ExecutionSession &ES;		ExecutionSession &ES;

std::map<VModuleKey, std::unique_ptr<LinkedObject>> LinkedObjects;
ResourcesGetter GetResources;		ResourcesGetter GetResources;
NotifyLoadedFtor NotifyLoaded;		NotifyLoadedFtor NotifyLoaded;
NotifyFinalizedFtor NotifyFinalized;		NotifyFinalizedFtor NotifyFinalized;
NotifyFreedFtor NotifyFreed;		NotifyFreedFtor NotifyFreed;

		// NB! `LinkedObjects` needs to be destroyed before `NotifyFreed` because
		// `~ConcreteLinkedObject` calls `NotifyFreed`
		std::map<VModuleKey, std::unique_ptr<LinkedObject>> LinkedObjects;
bool ProcessAllSections = false;		bool ProcessAllSections = false;
};		};

} // end namespace orc		} // end namespace orc
} // end namespace llvm		} // end namespace llvm

#endif // LLVM_EXECUTIONENGINE_ORC_RTDYLDOBJECTLINKINGLAYER_H		#endif // LLVM_EXECUTIONENGINE_ORC_RTDYLDOBJECTLINKINGLAYER_H