From cc796c202d9cc28dfc4d2625737b29e7d4a6008d Mon Sep 17 00:00:00 2001 From: anders_k Date: Tue, 21 May 2013 19:18:26 +0000 Subject: [PATCH] Fix !searchparse git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6367 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index 308ea84b..aea4859e 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -6884,12 +6884,12 @@ DefineList *CEXEBuild::searchParseString(const TCHAR *source_string, LineParser& if (failParam) *failParam = ret ? ret->getnum() : 0; if (noErrors) break; // Caller is OK with a incomplete list of matched strings const TCHAR *msgprefix = src_start ? _T("") : _T("starting "); - ERROR_MSG(_T("!searchparse: %sstring \"%s\" not found, aborted search!\n"),msgprefix,tok); + ERROR_MSG(_T("!searchparse: %sstring \"%s\" not found, aborted search!\n"),msgprefix,tok?tok:_T("(null)")); delete ret; return NULL; } if (maxlen < 0) break; - defout = line.gettoken_str(parmOffs++), src_start = source_string + toklen; + defout = line.gettoken_str(parmOffs++), src_start = source_string += toklen; } return ret; }