mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11477] Correctly unload scriptlib at errors.

Browse source 
This will prevent unexpected call some handlers
for "unloaded" sriptlib DLL.
This commit is contained in:
VladimirMangos 2011-05-12 21:37:27 +04:00
parent 8931b7ca11
commit 7e79c611ec
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/ScriptMgr.cpp
View file

@ -1118,8 +1118,9 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
GetScriptHookPtr((P), (N)); \ GetScriptHookPtr((P), (N)); \
if (!(P)) \ if (!(P)) \
{ \ { \
MANGOS_CLOSE_LIBRARY(m_hScriptLib); \ /* prevent call before init */ \
m_hScriptLib = NULL; \ m_pOnFreeScriptLibrary = NULL; \
UnloadScriptLibrary(); \
return SCRIPT_LOAD_ERR_WRONG_API; \ return SCRIPT_LOAD_ERR_WRONG_API; \
} }
@ -1160,7 +1161,11 @@ ScriptLoadResult ScriptMgr::LoadScriptLibrary(const char* libName)
# undef GET_SCRIPT_HOOK_PTR # undef GET_SCRIPT_HOOK_PTR
if (strcmp(pGetMangosRevStr(), REVISION_NR) != 0) if (strcmp(pGetMangosRevStr(), REVISION_NR) != 0)
{
m_pOnFreeScriptLibrary = NULL; // prevent call before init
UnloadScriptLibrary();
return SCRIPT_LOAD_ERR_OUTDATED; return SCRIPT_LOAD_ERR_OUTDATED;
}
m_pOnInitScriptLibrary(); m_pOnInitScriptLibrary();
return SCRIPT_LOAD_OK; return SCRIPT_LOAD_OK;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11476" #define REVISION_NR "11477"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__