| 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 | |
| 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 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircsession.cpp | 8 | ||||
| -rw-r--r-- | noncore/todayplugins/stockticker/libstocks/csv.c | 3 |
3 files changed, 10 insertions, 5 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 @@ -706,2 +706,4 @@ void MineField::readConfig(Config& cfg) Mine* m = mine( y, x ); + if (!m) + continue; if ( st >= 5 ) { @@ -730,3 +732,3 @@ void MineField::readConfig(Config& cfg) Mine* m = mine( y, x ); - if ( m->state() == Mine::Empty ) + if ( m && m->state() == Mine::Empty ) m->setHint(getHint(y,x)); diff --git a/noncore/net/opieirc/ircsession.cpp b/noncore/net/opieirc/ircsession.cpp index c8d7869..d87ff80 100644 --- a/noncore/net/opieirc/ircsession.cpp +++ b/noncore/net/opieirc/ircsession.cpp @@ -142,5 +142,7 @@ void IRCSession::updateNickname(const QString &oldNickname, const QString &newNi IRCChannelPerson *chanperson = it.current()->getPerson(oldNickname); - it.current()->removePerson(chanperson); - chanperson->setNick(newNickname); - it.current()->addPerson(chanperson); + if (chanperson) { + it.current()->removePerson(chanperson); + chanperson->setNick(newNickname); + it.current()->addPerson(chanperson); + } } diff --git a/noncore/todayplugins/stockticker/libstocks/csv.c b/noncore/todayplugins/stockticker/libstocks/csv.c index 6170bed..86d8607 100644 --- a/noncore/todayplugins/stockticker/libstocks/csv.c +++ b/noncore/todayplugins/stockticker/libstocks/csv.c @@ -316,3 +316,4 @@ stock *parse_csv_history_file(char *csv_file) /* do not use the first line */ - end_line = strstr(line, "\n"); + if (!(end_line = strstr(line, "\n"))) + return 0; *end_line = 0; |