File nsis-redirecting-url.patch of Package nsis

Overview Repositories Revisions Requests Users Attributes Meta

File nsis-redirecting-url.patch of Package nsis (Revision ca8a103662c92cd20560c850f3e738b2)

Currently displaying revision ca8a103662c92cd20560c850f3e738b2 , Show latest

From 83a22dd39bbf794622ca2a9e4e71a37b4e4f33de Mon Sep 17 00:00:00 2001
From: belphegor-belbel <belphegor@belbel.or.jp>
Date: Fri, 31 Mar 2023 15:29:13 +0900
Subject: [PATCH] Fix where redirecting URLs may not include schemes or hosts

---
 Contrib/NSISdl/httpget.cpp | 45 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/Contrib/NSISdl/httpget.cpp b/Contrib/NSISdl/httpget.cpp
index ceeb4f6435..6ccdcb71eb 100644
--- a/Contrib/NSISdl/httpget.cpp
+++ b/Contrib/NSISdl/httpget.cpp
@@ -393,7 +393,50 @@ int JNL_HTTPGet::run()
         char *p=buf+9; while (*p== ' ') p++;
         if (*p)
         {
-          connect(p);
+          char newurl[1024];
+
+          lstrcpyA(newurl, p);
+          if (my_strnicmp(newurl, "http://", 7))
+          {
+            char *q;
+
+            // generate full URL from original
+            lstrcpyA(newurl, m_http_url);
+
+            if (p[0] == '/')
+            {
+              // new location is an absolute path
+              q=&(newurl[7]);
+              while (*q != 0)
+              {
+                if (*q == '/')
+                {
+                  *q=0;
+                  break;
+                }
+                q++;
+              }
+            }
+            else
+            {
+              // new location is an relative path
+              q=&(newurl[lstrlenA(newurl) - 1]);
+              while (q >= newurl)
+              {
+                if (*q == '/')
+                {
+                  *q=0;
+                  break;
+                }
+                q--;
+              }
+
+              lstrcatA(newurl, "/");
+            }
+
+            lstrcatA(newurl, p);
+          }
+          connect(newurl);
           return 0;
         }
       }

Places

File nsis-redirecting-url.patch of Package nsis (Revision ca8a103662c92cd20560c850f3e738b2)

Places