Fixed crashbug in get_module: if a not-new-api or bad-file module didn't load, it crashed

This commit is contained in:
Pavol Marko 2004-09-17 18:33:15 +00:00
parent 895948ca45
commit 5133915e9c

View File

@ -2304,16 +2304,16 @@ static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params)
if ((*moduleIter).isAmxx()) if ((*moduleIter).isAmxx())
{ {
const amxx_module_info_s *info = (*moduleIter).getInfoNew(); const amxx_module_info_s *info = (*moduleIter).getInfoNew();
set_amxstring(amx, params[2], info->name, params[3]); set_amxstring(amx, params[2], info && info->name ? info->name : "unk", params[3]);
set_amxstring(amx, params[4], info->author, params[5]); set_amxstring(amx, params[4], info && info->author ? info->author : "unk", params[5]);
set_amxstring(amx, params[6], info->version, params[7]); set_amxstring(amx, params[6], info && info->version ? info->version : "unk", params[7]);
} }
else else
{ {
module_info_s *info = (*moduleIter).getInfo(); module_info_s *info = (*moduleIter).getInfo();
set_amxstring(amx, params[2], info->name, params[3]); set_amxstring(amx, params[2], info && info->name ? info->name : "unk", params[3]);
set_amxstring(amx, params[4], info->author, params[5]); set_amxstring(amx, params[4], info && info->author ? info->author : "unk", params[5]);
set_amxstring(amx, params[6], info->version, params[7]); set_amxstring(amx, params[6], info && info->version ? info->version : "unk", params[7]);
} }
// compatibility problem possible // compatibility problem possible