Merge pull request #401 from FabianTerhorst/rc

Release
FabianTerhorst · Nov 30, 2021 · 052ba7b · 052ba7b
2 parents c1376b4 + fd6db95
commit 052ba7b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/runtime/include/CSharpResourceImpl.h b/runtime/include/CSharpResourceImpl.h
@@ -97,32 +97,24 @@ struct ClrConnectionInfo {
     socialId(info.socialId), hwidHash(info.hwidHash), hwidExHash(info.hwidExHash),
     isDebug(info.isDebug),
     build(info.build), passwordHash(info.passwordHash) {
-        auto nameSize = strlen(info.name.GetData()) + 1;
-        name = (char*) malloc(nameSize);
-        memset(name, '\0', nameSize);
-        strcpy(name, info.name.CStr());
-
-        auto authTokenSize = strlen(info.authToken.GetData()) + 1;
-        authToken = (char*) malloc(authTokenSize);
-        memset(authToken, '\0', authTokenSize);
-        strcpy(authToken, info.authToken.CStr());
-
-        auto branchSize = strlen(info.branch.GetData()) + 1;
-        branch = (char*) malloc(branchSize);
-        memset(branch, '\0', branchSize);
-        strcpy(branch, info.branch.CStr());
-
-        auto cdnUrlSize = strlen(info.cdnUrl.GetData()) + 1;
-        cdnUrl = (char*) malloc(cdnUrlSize);
-        memset(cdnUrl, '\0', cdnUrlSize);
-        strcpy(cdnUrl, info.cdnUrl.CStr());
+        name = new char[info.name.length() + 1];
+        strcpy(name, info.name.c_str());
+
+        authToken = new char[info.authToken.length() + 1];
+        strcpy(authToken, info.authToken.c_str());
+
+        branch = new char[info.branch.length() + 1];
+        strcpy(branch, info.branch.c_str());
+
+        cdnUrl = new char[info.cdnUrl.length() + 1];
+        strcpy(cdnUrl, info.cdnUrl.c_str());
     }
 
     void dealloc() const {
-        free(name);
-        free(authToken);
-        free(branch);
-        free(cdnUrl);
+        delete[] name;
+        delete[] authToken;
+        delete[] branch;
+        delete[] cdnUrl;
     }
 };
 

diff --git a/runtime/src/CSharpResourceImpl.cpp b/runtime/src/CSharpResourceImpl.cpp
@@ -165,7 +165,7 @@ bool CSharpResourceImpl::OnEvent(const alt::CEvent* ev) {
             auto beforeConnectEvent = (alt::CPlayerBeforeConnectEvent*)ev;
             auto clrInfo = ClrConnectionInfo(beforeConnectEvent->GetConnectionInfo());
 
-            OnPlayerBeforeConnectDelegate(beforeConnectEvent, &clrInfo, beforeConnectEvent->GetReason().CStr());
+            OnPlayerBeforeConnectDelegate(beforeConnectEvent, &clrInfo, beforeConnectEvent->GetReason().c_str());
 
             clrInfo.dealloc();
         }

diff --git a/runtime/thirdparty/altv-cpp-api b/runtime/thirdparty/altv-cpp-api