From f4c56119bec0f2cb525f3423875e780f6a9f65f6 Mon Sep 17 00:00:00 2001 From: kichik Date: Tue, 4 Nov 2003 16:59:17 +0000 Subject: [PATCH] patch #835443 - simpler SetUserVariable git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3096 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/ExDLL/exdll.dpr | 5 ++--- Contrib/ExDLL/nsis.pas | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Contrib/ExDLL/exdll.dpr b/Contrib/ExDLL/exdll.dpr index 2e92ac57..66d72f04 100644 --- a/Contrib/ExDLL/exdll.dpr +++ b/Contrib/ExDLL/exdll.dpr @@ -98,11 +98,10 @@ end; procedure SetUserVariable(varnum: TVariableList; value: PChar); begin - if (value = nil) or (integer(varnum) < 0) or (integer(varnum) >= integer(__INST_LAST)) then + if (value <> nil) and (integer(varnum) >= 0) and (integer(varnum) < integer(__INST_LAST)) then begin - Exit; + lstrcpy(g_variables+integer(varnum)*g_stringsize,value); end; - lstrcpy(g_variables+integer(varnum)*g_stringsize,value); end; function ex_dll(hwndParent: HWND; string_size: integer; variables: PChar; stacktop: pointer):integer; cdecl; diff --git a/Contrib/ExDLL/nsis.pas b/Contrib/ExDLL/nsis.pas index e0fd1a23..b97fcc18 100644 --- a/Contrib/ExDLL/nsis.pas +++ b/Contrib/ExDLL/nsis.pas @@ -119,11 +119,10 @@ end; procedure SetUserVariable(varnum: TVariableList; value: PChar); begin - if (value = nil) or (integer(varnum) < 0) or (integer(varnum) >= integer(__INST_LAST)) then + if (value <> nil) and (integer(varnum) >= 0) and (integer(varnum) < integer(__INST_LAST)) then begin - Exit; + lstrcpy(g_variables+integer(varnum)*g_stringsize,value); end; - lstrcpy(g_variables+integer(varnum)*g_stringsize,value); end; begin