From 8f3d528b7efba1b3c86a5a4934eae5ace78459a9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 27 Nov 2015 22:49:18 +0100
Subject: AGI: Better pointer checking

---
 engines/agi/words.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index ff9049fdc5..438c1ce354 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -161,11 +161,13 @@ void AgiEngine::dictionaryWords(char *msg) {
 	char *q = NULL;
 	int wid, wlen;
 
+	assert(msg);
+
 	debugC(2, kDebugLevelScripts, "msg = \"%s\"", msg);
 
 	cleanInput();
 
-	for (p = msg; p && *p && getvar(vWordNotFound) == 0;) {
+	for (p = msg; *p && getvar(vWordNotFound) == 0;) {
 		if (*p == 0x20)
 			p++;
 
@@ -205,7 +207,7 @@ void AgiEngine::dictionaryWords(char *msg) {
 			break;
 		}
 
-		if (p != NULL && *p) {
+		if (*p) {
 			debugC(2, kDebugLevelScripts, "p = %s", p);
 			*p = 0;
 			p++;
-- 
cgit v1.2.3