From 268e47c0d3791483f3d0066e24c6686c3c938da9 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 27 Mar 2009 06:45:13 -0600 Subject: Fix a segfault with empty whisper messages --- src/commandhandler.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/commandhandler.cpp') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index f875fd85..b315b628 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -353,7 +353,8 @@ void CommandHandler::handleMsg(const std::string &args) if (pos != std::string::npos) { recvnick = args.substr(1, pos - 1); - msg = args.substr(pos + 2, args.length()); + if (pos + 2 < args.length()) + msg = args.substr(pos + 2, args.length()); } } else @@ -362,7 +363,8 @@ void CommandHandler::handleMsg(const std::string &args) if (pos != std::string::npos) { recvnick = args.substr(0, pos); - msg = args.substr(pos + 1, args.length()); + if (pos + 1 < args.length()) + msg = args.substr(pos + 1, args.length()); } else { -- cgit v1.2.3-70-g09d2