[Scummvm-cvs-logs] SF.net SVN: scummvm:[52612] scummvm/branches/gsoc2010-plugins/backends/ plugins/elf/elf-provider.cpp

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Tue Sep 7 00:17:46 CEST 2010


Revision: 52612
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52612&view=rev
Author:   dhewg
Date:     2010-09-06 22:17:46 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
PLUGINS: Only resolve __dso_handle if loading was successful.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf/elf-provider.cpp

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf/elf-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf/elf-provider.cpp	2010-09-06 22:17:23 UTC (rev 52611)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf/elf-provider.cpp	2010-09-06 22:17:46 UTC (rev 52612)
@@ -113,11 +113,13 @@
 	bool ret = DynamicPlugin::loadPlugin();
 
 #ifdef ELF_LOADER_CXA_ATEXIT
-	// FIXME HACK: Reverse HACK of findSymbol() :P
-	VoidFunc tmp;
-	tmp = findSymbol("__dso_handle");
-	memcpy(&_dso_handle, &tmp, sizeof(VoidFunc));
-	debug(2, "elfloader: __dso_handle is %p", _dso_handle);
+	if (ret) {
+		// FIXME HACK: Reverse HACK of findSymbol() :P
+		VoidFunc tmp;
+		tmp = findSymbol("__dso_handle");
+		memcpy(&_dso_handle, &tmp, sizeof(VoidFunc));
+		debug(2, "elfloader: __dso_handle is %p", _dso_handle);
+	}
 #endif
 
 	_dlHandle->discard_symtab();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list