Downgrade bshook (5.1.7 is for 1.37), downgrade curl for now, add fai…

…lure detection in libcurl
FrozenAlex · Jun 7, 2024 · 6822736 · 6822736
1 parent b6bd5ec
commit 6822736
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/qpm.json b/qpm.json
@@ -15,7 +15,7 @@
   "dependencies": [
     {
       "id": "beatsaber-hook",
-      "versionRange": "^5.1.6",
+      "versionRange": "5.1.6",
       "additionalData": {}
     },
     {
@@ -38,7 +38,7 @@
     },
     {
       "id": "libcurl",
-      "versionRange": "*",
+      "versionRange": "8.5.0",
       "additionalData": {
         "private": true
       }

diff --git a/qpm.shared.json b/qpm.shared.json
@@ -19,7 +19,7 @@
     "dependencies": [
       {
         "id": "beatsaber-hook",
-        "versionRange": "^5.1.6",
+        "versionRange": "=5.1.6",
         "additionalData": {}
       },
       {
@@ -42,7 +42,7 @@
       },
       {
         "id": "libcurl",
-        "versionRange": "*",
+        "versionRange": "=8.5.0",
         "additionalData": {
           "private": true
         }
@@ -77,17 +77,17 @@
     {
       "dependency": {
         "id": "bsml",
-        "versionRange": "=0.4.24",
+        "versionRange": "=0.4.31",
         "additionalData": {
-          "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.24/libbsml.so",
-          "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.24/debug_libbsml.so",
+          "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/libbsml.so",
+          "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/debug_libbsml.so",
           "overrideSoName": "libbsml.so",
-          "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.24/BSML.qmod",
-          "branchName": "version/v0_4_24",
+          "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/BSML.qmod",
+          "branchName": "version/v0_4_31",
           "cmake": true
         }
       },
-      "version": "0.4.24"
+      "version": "0.4.31"
     },
     {
       "dependency": {
@@ -158,12 +158,13 @@
     {
       "dependency": {
         "id": "libil2cpp",
-        "versionRange": "=0.3.1",
+        "versionRange": "=0.3.2",
         "additionalData": {
-          "headersOnly": true
+          "headersOnly": true,
+          "cmake": false
         }
       },
-      "version": "0.3.1"
+      "version": "0.3.2"
     },
     {
       "dependency": {

diff --git a/src/WebUtils.cpp b/src/WebUtils.cpp
@@ -164,7 +164,9 @@ namespace WebUtils
 				auto res = curl_easy_perform(curl);
 				/* Check for errors */ 
 				if (res != CURLE_OK) {
-//					DEBUG("curl_easy_perform() failed: {}: {}", res, curl_easy_strerror(res));
+					curl_easy_cleanup(curl);
+					delete wrapper;
+					return finished(0, val);
 				}
 				curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
 				curl_easy_cleanup(curl);
@@ -226,7 +228,9 @@ namespace WebUtils
 				auto res = curl_easy_perform(curl);
 				/* Check for errors */ 
 				if (res != CURLE_OK) {
-//					getLogger().critical("curl_easy_perform() failed: %u: %s", res, curl_easy_strerror(res));
+					curl_easy_cleanup(curl);
+					delete wrapper;
+					return  finished(0, val);
 				}
 				curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &httpCode);
 				curl_easy_cleanup(curl);