Skip compression if malloc failed. Close post buffer as soon as the curl job is complete.

Author: bottiger1

context.cpp

@@ -15,9 +15,7 @@ CurlContext::CurlContext(CURL* c, IPluginContext* plugin) {
 CurlContext::~CurlContext() {
     curl_easy_cleanup(curl);
     if(headers != NULL)
-        curl_slist_free_all(headers);
-    if(post)
-        free(post);    
+        curl_slist_free_all(headers);   
 }
 
 void CurlContext::AddHeader(const char* string) {
@@ -26,37 +24,35 @@ void CurlContext::AddHeader(const char* string) {
         headers = new_headers;
 }
 
-// called right before the main thread adds job to the queue
+// called right before event thread adds job to the queue
 void CurlContext::OnCurlStarted() {
     in_event_thread = true;
     // compress post if available
-    if(post)
-    {
+    if(post) {
         char* compressBuffer = (char*)malloc(compressBound(postLength));
-        // TODO check malloc?
-        uLongf compressLength;
-        int result = compress2((Bytef*)compressBuffer, &compressLength, (Bytef*)post, postLength, Z_BEST_SPEED);
-        if(result == Z_OK)
-        {
-            free(post);
-            post = compressBuffer;
-            postLength = compressLength;
-            AddHeader("Content-Encoding: gzip");
-        }
-        else
-        {
-            // compression failed
-            free(compressBuffer);
+        if(compressBuffer != NULL) {
+            uLongf compressLength;
+            int result = compress2((Bytef*)compressBuffer, &compressLength, (Bytef*)post, postLength, Z_BEST_SPEED);
+            if(result == Z_OK) {
+                free(post);
+                post = compressBuffer;
+                postLength = compressLength;
+                AddHeader("Content-Encoding: gzip");
+            } else {
+                // compression failed
+                free(compressBuffer);
+            }
         }
 
         curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, postLength);
         curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post);
     }
 }
 
-// called when the main thread loops through finished jobs
-void CurlContext::OnCurlCompleted() {
+// called when the game thread loops through finished jobs
+void CurlContext::OnCurlCompletedGameThread() {
     in_event_thread = false;
+
     IPluginFunction* func = GetSourcepawnFunction(sourcepawn_plugin_context, sourcepawn_callback);
     // the plugin that called us disappeared, delete ourselves
     if(func == NULL) {
@@ -85,7 +81,15 @@ void CurlContext::OnCurlCompleted() {
     func->PushCell(sourcepawn_userdata);
     func->Execute(NULL);
 
-    //printf("Finished Code %i size %i\n%.*s\n", curlcode, buffer.size(), 256, &buffer[0]);
+    //printf("Finished Code %i size %i\n%.*s\n", curlcode, buffer.size(), 256, &buffer[0]);    
+}
+
+// called when event thread finishes a curl job
+void CurlContext::OnCurlCompleted() {
+    if(post) {
+        free(post);
+        post = NULL;
+    }
 }
 
 ////////////////

context.h

@@ -33,6 +33,7 @@ class CurlContext {
     void AddHeader(const char* string);
     void OnCurlStarted();
     void OnCurlCompleted();
+    void OnCurlCompletedGameThread();
 };
 
 class CurlSocketContext {

extension.cpp

@@ -58,7 +58,7 @@ void OnGameFrame(bool simulating) {
     if(!g_curl_done_queue.Empty()) {
         g_curl_done_queue.Lock();
         while(!g_curl_done_queue.Empty()) {
-            g_curl_done_queue.Pop()->OnCurlCompleted();
+            g_curl_done_queue.Pop()->OnCurlCompletedGameThread();
         }
         g_curl_done_queue.Unlock();
     }
@@ -76,6 +76,7 @@ void CheckCompletedCurlJobs() {
                 curl_multi_remove_handle(g_curl, message->easy_handle);
                 curl_easy_getinfo(message->easy_handle, CURLINFO_PRIVATE, (char*)&curl_context);
                 curl_context->curlcode = message->data.result;
+                curl_context->OnCurlCompleted();
                 g_curl_done_queue.Lock();
                 g_curl_done_queue.Push(curl_context);
                 g_curl_done_queue.Unlock();

sdk/smsdk_config.h

@@ -40,7 +40,7 @@
 /* Basic information exposed publicly */
 #define SMEXT_CONF_NAME			"Async"
 #define SMEXT_CONF_DESCRIPTION	"Asyncronous Network Commands"
-#define SMEXT_CONF_VERSION		"2.0"
+#define SMEXT_CONF_VERSION		"2.1"
 #define SMEXT_CONF_AUTHOR		"Bottiger"
 #define SMEXT_CONF_URL			"www.skial.com"
 #define SMEXT_CONF_LOGTAG		"ASYNC"