bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent use NULL-pointer. display message and exit

Browse Source
This commit is contained in:
Stas Degteff 2011-02-14 19:57:01 +00:00
parent f24985ea2f
commit 14dd2361a4
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
golded3/gccfgg0.cpp
View File

@ -114,6 +114,14 @@ bool gswitches::handle(word crc, const char* value) {
uint left,right,middle; uint left,right,middle;
word cur; word cur;
if (value == NULL) {
STD_PRINTNL("! Illegall call of function: gswitches::handle(" << crc << ",NULL). File " __FILE__ " line " << __LINE__);
LOG_NULL_POINTER;
LOG.printf("! Illegall call of function: gswitches::handle(%04X,NULL). File %s line %i ", crc, __FILE__, __LINE__);
PointerErrorExit();
return 0;
}
left = 0; left = 0;
right = gswitches_last - 1; right = gswitches_last - 1;
@ -143,6 +151,14 @@ bool gswitches::handle(word crc, const char* value) {
int SwitchCfg(word crc, char k, char* v) { int SwitchCfg(word crc, char k, char* v) {
if (v == NULL) {
STD_PRINTNL("! Illegall call of function: SwitchCfg(" << crc << "," << k << "," << "NULL). File " __FILE__ " line " << __LINE__);
LOG_NULL_POINTER;
LOG.printf("! Illegall call of function: SwitchCfg(%04X,%c,NULL). File %s line %i ", crc, k, __FILE__, __LINE__);
PointerErrorExit();
return false;
}
val = v; val = v;
bool found = true; bool found = true;
@ -673,6 +689,13 @@ End:
static int do_if(char* val) { static int do_if(char* val) {
if (val == NULL) {
STD_PRINTNL("! Illegall call of function: do_if(NULL). File " __FILE__ " line " << __LINE__);
LOG_NULL_POINTER;
LOG.printf("! Illegall call of function: do_if(NULL). File %s line %i.", __FILE__, __LINE__);
PointerErrorExit();
return 0;
}
if(strieql(val, "OS/2") or strieql(val, "OS2")) { if(strieql(val, "OS/2") or strieql(val, "OS2")) {
#ifdef __OS2__ #ifdef __OS2__
return true; return true;
@ -739,6 +762,13 @@ int ReadCfg(const char* cfgfile, int ignoreunknown)
word crc; word crc;
int cfgignore=NO, line=0; int cfgignore=NO, line=0;
if (cfgfile == NULL) {
STD_PRINTNL("! Illegall call of function: ReadCfg(NULL," << ignoreunknown << "). File " __FILE__ " line " << __LINE__);
LOG_NULL_POINTER;
LOG.printf("! Illegall call of function: ReadCfg(NULL,%i). File %s line %i ", ignoreunknown, __FILE__, __LINE__);
PointerErrorExit();
return 0;
}
// Open the file // Open the file
if(strlen(cfgfile) >= GMAXPATH) { if(strlen(cfgfile) >= GMAXPATH) {
STD_PRINTNL("* Filename '" << cfgfile << "' too long (max " << GMAXPATH-1 << " characters)."); STD_PRINTNL("* Filename '" << cfgfile << "' too long (max " << GMAXPATH-1 << " characters).");
@ -967,4 +997,3 @@ int ReadCfg(const char* cfgfile, int ignoreunknown)
// ------------------------------------------------------------------ // ------------------------------------------------------------------