From 0ae490320695a326c0bc88a48fd83a98da95f2d4 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 22 Dec 2007 15:27:33 +0000
Subject: [PATCH] fixed bug #1852141 - WordFind do not support Chinese

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5435 212acab6-be3b-0410-9dea-997c60f758d6
---
 Include/WordFunc.nsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Include/WordFunc.nsh b/Include/WordFunc.nsh
index 62a119b8..d5c9d679 100644
--- a/Include/WordFunc.nsh
+++ b/Include/WordFunc.nsh
@@ -206,6 +206,7 @@ VersionConvert
 			Push $8
 			Push $9
 			Push $R1
+			Push $R2
 			ClearErrors
 
 			StrCpy $9 ''
@@ -251,7 +252,8 @@ VersionConvert
 			loop:
 			StrCpy $8 $R0 $7 $6
 			StrCmp${_WORDFUNC_S} $8$5 0 error1
-			StrCmp${_WORDFUNC_S} $8 '' +2
+			StrLen $R2 $8
+			IntCmp $R2 0 +2
 			StrCmp${_WORDFUNC_S} $8 $0 +5 preloop
 			StrCmp${_WORDFUNC_S} $3 '{' minus
 			StrCmp${_WORDFUNC_S} $3 '}' minus
@@ -353,6 +355,7 @@ VersionConvert
 			end:
 			StrCpy $R0 $R1
 
+			Pop $R2
 			Pop $R1
 			Pop $9
 			Pop $8