diff --git a/Changelog b/Changelog index da6d27c..2328e43 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,8 @@ [Changes 1.2c01] +* Skip malformed abots.sav entries in read_abot(), avoiding null + dereferences found by Coverity. (flashback) + * Ensure proper handling of % when /FSET DCC is used. (caf) * Improve robustness of CDCC save file loading. (caf) diff --git a/dll/abot/autobot.c b/dll/abot/autobot.c index d62116a..d736ed6 100644 --- a/dll/abot/autobot.c +++ b/dll/abot/autobot.c @@ -198,8 +198,12 @@ UserList *new; chop(buffer, 1); u = buffer; h = strchr(u, '!'); + if (!h) + continue; *h++ = 0; p = strchr(h, ','); + if (!p) + continue; *p++ = 0; if ((c = strchr(p, ','))) *c++ = 0;