Update to 1.1.17

Fixed a critical security vulnerability related to Log4j (CVE-2021-44228). Properly this time.
Kron4ek · Dec 12, 2021 · 8aa51bc · 8aa51bc
1 parent 188dae7
commit 8aa51bc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.1.17
+	* Fixed a critical security vulnerability related to Log4j (CVE-2021-44228). Properly this time.
+---------------------------------------------------------------------
 v1.1.16
 	* Fixed a critical security vulnerability related to Log4j ([CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228)).
 	* Added handling of two new Minecraft arguments (clientId and xuid).

diff --git a/vlauncher_linux.pb b/vlauncher_linux.pb
@@ -42,7 +42,7 @@ Define.i useCustomJavaDefault = 0
 Define.i useCustomParamsDefault = 0
 Define.i keepLauncherOpenDefault = 0
 
-Define.s launcherVersion = "1.1.16"
+Define.s launcherVersion = "1.1.17"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -245,8 +245,6 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                     If releaseTimeMember
                       releaseTime = Val(StringField(GetJSONString(releaseTimeMember), 1, "-")) * 365 + Val(StringField(GetJSONString(releaseTimeMember), 2, "-")) * 30
                     EndIf
-
-                    FreeJSON(inheritsJson)
                   Else
                     MessageRequester("Error", inheritsClientJar + ".json file is missing!") : Break
                   EndIf
@@ -260,7 +258,11 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
-                loggingMember = GetJSONMember(jsonObject, "logging")
+                If jsonInheritsFromMember And inheritsJson
+                  loggingMember = GetJSONMember(inheritsJsonObject, "logging")
+                Else
+                  loggingMember = GetJSONMember(jsonObject, "logging")
+                EndIf
 
                 If loggingMember
                   loggingClientMember = GetJSONMember(loggingMember, "client")
@@ -274,6 +276,10 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
+                If inheritsJson
+                  FreeJSON(inheritsJson)
+                EndIf
+
                 If FileSize(clientJarFile) > 0
                   librariesString = parseLibraries(clientVersion, downloadMissingLibraries) + librariesString
                   clientMainClass = GetJSONString(GetJSONMember(jsonObject, "mainClass"))

diff --git a/vlauncher_macos.pb b/vlauncher_macos.pb
@@ -42,7 +42,7 @@ Define.i useCustomJavaDefault = 0
 Define.i useCustomParamsDefault = 0
 Define.i keepLauncherOpenDefault = 0
 
-Define.s launcherVersion = "1.1.16"
+Define.s launcherVersion = "1.1.17"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -254,8 +254,6 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                     If releaseTimeMember
                       releaseTime = Val(StringField(GetJSONString(releaseTimeMember), 1, "-")) * 365 + Val(StringField(GetJSONString(releaseTimeMember), 2, "-")) * 30
                     EndIf
-
-                    FreeJSON(inheritsJson)
                   Else
                     MessageRequester("Error", inheritsClientJar + ".json file is missing!") : Break
                   EndIf
@@ -269,7 +267,11 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
-                loggingMember = GetJSONMember(jsonObject, "logging")
+                If jsonInheritsFromMember And inheritsJson
+                  loggingMember = GetJSONMember(inheritsJsonObject, "logging")
+                Else
+                  loggingMember = GetJSONMember(jsonObject, "logging")
+                EndIf
 
                 If loggingMember
                   loggingClientMember = GetJSONMember(loggingMember, "client")
@@ -283,6 +285,10 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
+                If inheritsJson
+                  FreeJSON(inheritsJson)
+                EndIf
+
                 If FileSize(clientJarFile) > 0
                   librariesString = parseLibraries(clientVersion, downloadMissingLibraries) + librariesString
                   clientMainClass = GetJSONString(GetJSONMember(jsonObject, "mainClass"))

diff --git a/vlauncher_windows.pb b/vlauncher_windows.pb
@@ -45,7 +45,7 @@ Define.i keepLauncherOpenDefault = 0
 Global.i useCustomJavaDefault = 0
 Global.s javaBinaryPathDefault = "C:\jre8\bin\javaw.exe"
 
-Define.s launcherVersion = "1.1.16"
+Define.s launcherVersion = "1.1.17"
 Define.s launcherDeveloper = "Kron4ek"
 
 Declare assetsToResources(assetsIndex.s)
@@ -258,8 +258,6 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                     If releaseTimeMember
                       releaseTime = Val(StringField(GetJSONString(releaseTimeMember), 1, "-")) * 365 + Val(StringField(GetJSONString(releaseTimeMember), 2, "-")) * 30
                     EndIf
-
-                    FreeJSON(inheritsJson)
                   Else
                     MessageRequester("Error", inheritsClientJar + ".json file is missing!") : Break
                   EndIf
@@ -273,7 +271,11 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
-                loggingMember = GetJSONMember(jsonObject, "logging")
+                If jsonInheritsFromMember And inheritsJson
+                  loggingMember = GetJSONMember(inheritsJsonObject, "logging")
+                Else
+                  loggingMember = GetJSONMember(jsonObject, "logging")
+                EndIf
 
                 If loggingMember
                   loggingClientMember = GetJSONMember(loggingMember, "client")
@@ -287,6 +289,10 @@ If OpenWindow(0, #PB_Ignore, #PB_Ignore, windowWidth, windowHeight, "Vortex Mine
                   EndIf
                 EndIf
 
+                If inheritsJson
+                  FreeJSON(inheritsJson)
+                EndIf
+
                 If FileSize(clientJarFile) > 0
                   librariesString = parseLibraries(clientVersion, downloadMissingLibraries) + librariesString
                   clientMainClass = GetJSONString(GetJSONMember(jsonObject, "mainClass"))