1 files changed, 14 insertions, 8 deletions
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index f023b14..41af46d 100755
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -116,12 +116,12 @@ void NSISCALL myDelete(char *buf, int flags)
     mystrcpy(lbuf,buf);
 #ifdef NSIS_SUPPORT_RMDIR
     if (flags & DEL_DIR)
-      lstrcat(lbuf,"\\*.*");
+      mystrcat(lbuf,"\\*.*");
     else
 #endif//NSIS_SUPPORT_RMDIR
       trimslashtoend(buf);
 
-    lstrcat(buf,"\\");
+    mystrcat(buf,"\\");
 
     fn=buf+mystrlen(buf);
 
@@ -218,7 +218,7 @@ void NSISCALL myDelete(char *buf, int flags)
 
 char *NSISCALL addtrailingslash(char *str)
 {
-  if (lastchar(str)!='\\') lstrcat(str,"\\");
+  if (lastchar(str)!='\\') mystrcat(str,"\\");
   return str;
 }
 
@@ -289,6 +289,8 @@ int NSISCALL is_valid_instpath(char *s)
 
   mystrcpy(tmp, s);
 
+  validate_filename(tmp);
+
   root = skip_root(tmp);
 
   if (!root)
@@ -417,7 +419,7 @@ void NSISCALL MoveFileOnReboot(LPCTSTR pszExisting, LPCTSTR pszNew)
     cchRenameLine = wsprintf(szRenameLine,"%s=%s\r\n",tmpbuf,wininit);
 
     GetWindowsDirectory(wininit, 1024-16);
-    lstrcat(wininit, "\\wininit.ini");
+    mystrcat(wininit, "\\wininit.ini");
     hfile = CreateFile(wininit,
         GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_ALWAYS,
         FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
@@ -552,6 +554,11 @@ int NSISCALL mystrlen(const char *in)
   return lstrlen(in);
 }
 
+char * NSISCALL mystrcat(char *out, const char *concat)
+{
+  return lstrcat(out, concat);
+}
+
 char ps_tmpbuf[NSIS_MAX_STRLEN*2];
 
 #define SYSREGKEY "Software\\Microsoft\\Windows\\CurrentVersion"
@@ -640,7 +647,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
 
         if (*out && append)
         {
-          lstrcat(out, append);
+          mystrcat(out, append);
         }
 
         validate_filename(out);
@@ -681,7 +688,7 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
   return ps_tmpbuf;
 }
 
-char * NSISCALL validate_filename(char *in) {
+void NSISCALL validate_filename(char *in) {
   char *nono = "*?|<>/\":";
   char *out;
   char *out_save;
@@ -715,7 +722,6 @@ char * NSISCALL validate_filename(char *in) {
     else
       break;
   } while (out_save < out);
-  return out_save;
 }
 
 #ifdef NSIS_CONFIG_LOG
@@ -746,7 +752,7 @@ void NSISCALL log_write(int close)
     if (fp!=INVALID_HANDLE_VALUE)
     {
       DWORD d;
-      lstrcat(log_text,"\r\n");
+      mystrcat(log_text,"\r\n");
       WriteFile(fp,log_text,mystrlen(log_text),&d,NULL);
     }
   }