diff options
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | src/modules.c | 8 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -18,6 +18,7 @@ Provided by illu. <illu@rs2i.net> - 2006 01/25 F Updated the french language file. [ #00] Provided by Trystan <trystan@nomadirc.net> - 2006 +03/01 F Crash when not giving user for moduleGetLangString. [#454] 02/23 F Usermatching possible null arg on sstrdup. [ #00] 02/12 F Double unbanning of in certain conditions. [ #00] 01/25 F va_copy issue for various platforms. [ #00] diff --git a/src/modules.c b/src/modules.c index 8c37fb61c..4201fb6a4 100644 --- a/src/modules.c +++ b/src/modules.c @@ -2564,7 +2564,7 @@ char *moduleGetLangString(User * u, int number) mod_current_module = findModule(mod_current_module_name); /* Find the users lang, and use it if we can */ - if (u->na && u->na->nc) + if (u && u->na && u->na->nc) lang = u->na->nc->language; /* If the users lang isnt supported, drop back to English */ @@ -2572,14 +2572,16 @@ char *moduleGetLangString(User * u, int number) lang = LANG_EN_US; /* If the requested lang string exists for the language */ - if (mod_current_module->lang[lang].argc > number) + if (mod_current_module->lang[lang].argc > number) { return mod_current_module->lang[lang].argv[number]; /* Return an empty string otherwise, because we might be used without * the return value being checked. If we would return NULL, bad things * would happen! */ - else + } else { + alog("%s: INVALID language string call, language: [%d], String [%d]", mod_current_module->name, lang, number); return ""; + } } /** diff --git a/version.log b/version.log index a758434a5..f4091b2da 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="13" VERSION_EXTRA="-svn" -VERSION_BUILD="972" +VERSION_BUILD="974" # $Log$ # +# BUILD : 1.7.13 (974) +# BUGS : 454 +# NOTES : Fixed a crash when passing a NULL-user to moduleGetLangString +# # BUILD : 1.7.13 (972) # BUGS : # NOTES : Fixed a bug involving EVENT_ACCESS_DEL. |