| author | erik <erik> | 2007-01-22 23:01:41 (UTC) |
|---|---|---|
| committer | erik <erik> | 2007-01-22 23:01:41 (UTC) |
| commit | adcf6075db477909dd8170a74862a6ef91a5127f (patch) (side-by-side diff) | |
| tree | da0a1e35c5d392271bce29e84d3af5c30a864f56 /noncore/games/minesweep | |
| parent | 9b4871054d01a47b4c546952a0948553413840d6 (diff) | |
| download | opie-adcf6075db477909dd8170a74862a6ef91a5127f.zip opie-adcf6075db477909dd8170a74862a6ef91a5127f.tar.gz opie-adcf6075db477909dd8170a74862a6ef91a5127f.tar.bz2 | |
Each file in this commit had a problem where a function might return
a null value for a pointer and that null value was not checked.
| -rw-r--r-- | noncore/games/minesweep/minefield.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp index 72c05b0..1987ea5 100644 --- a/noncore/games/minesweep/minefield.cpp +++ b/noncore/games/minesweep/minefield.cpp @@ -704,6 +704,8 @@ void MineField::readConfig(Config& cfg) char code='A'+(x*17+y*101)%21; // Reduce the urge to cheat int st = (char)(QChar)grid[i++]-code; Mine* m = mine( y, x ); + if (!m) + continue; if ( st >= 5 ) { st-=5; m->setMined(TRUE); @@ -728,7 +730,7 @@ void MineField::readConfig(Config& cfg) for ( x = 0; x < numCols; x++ ) { for ( int y = 0; y < numRows; y++ ) { Mine* m = mine( y, x ); - if ( m->state() == Mine::Empty ) + if ( m && m->state() == Mine::Empty ) m->setHint(getHint(y,x)); } } |