[Super-tux-commit] supertux/src lispreader.cpp,1.30,1.31
Brought to you by:
wkendrick
From: Ricardo C. <rm...@us...> - 2004-07-12 22:03:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27245/src Modified Files: lispreader.cpp Log Message: Damn strlen() crashes when NULL is passed. Fixed. Index: lispreader.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/lispreader.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- lispreader.cpp 9 Jul 2004 22:16:49 -0000 1.30 +++ lispreader.cpp 12 Jul 2004 22:03:18 -0000 1.31 @@ -1218,7 +1218,7 @@ (text-fr "Bonjour Monde!") being fr the value of LANG (echo $LANG) for the language we want to translate to */ - char* lang = getenv("LANG"); + char* lang = getenv("tt"); char str_[1024]; // check, for instance, for (title-fr_FR "Bonjour") sprintf(str_, "%s-%s", name, lang); @@ -1227,7 +1227,7 @@ if(!obj) // check, for instance, for (title-fr "Bonjour") { - if(strlen(lang) >= 2) + if(lang != NULL && strlen(lang) >= 2) { char lang_[3]; strncpy(lang_, lang, 2); |