From adcf6075db477909dd8170a74862a6ef91a5127f Mon Sep 17 00:00:00 2001 From: erik Date: Mon, 22 Jan 2007 23:01:41 +0000 Subject: 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. --- (limited to 'noncore/games') 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)); } } -- cgit v0.9.0.2