url encode messages from solver using libcurl.

virtualcell · Apr 23, 2018 · 0cd96b6 · 0cd96b6
1 parent 07dc496
commit 0cd96b6
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/VCellMessaging/src/SimulationMessaging.cpp b/VCellMessaging/src/SimulationMessaging.cpp
@@ -252,25 +252,29 @@ void SimulationMessaging::sendStatus() {
 
 			char* revisedMsg = workerEvent->eventMessage;
 			if (revisedMsg != NULL) {
-				revisedMsg = trim(revisedMsg);
-				if (strlen(revisedMsg) > 2048) {
-					revisedMsg[2047] = 0; //status message is only 2048 chars long in database
-				}
-
-				for (int i = 0; i < (int)strlen(revisedMsg); i ++) {
-					switch (revisedMsg[i]) {
-					case '\r':
-					case '\n':
-					case '\'':
-					case '\"':
-						revisedMsg[i] = ' ';
-						break;
-						// these characters are not valid both in database and in messages as a property
-					}
-				}
-			}
-			if (revisedMsg != NULL) {
-				ss_url << WORKEREVENT_STATUSMSG << "=" << revisedMsg << "&";
+                revisedMsg = trim(revisedMsg);
+                if (strlen(revisedMsg) > 2048) {
+                    revisedMsg[2047] = 0; //status message is only 2048 chars long in database
+                }
+
+                for (int i = 0; i < (int) strlen(revisedMsg); i++) {
+                    switch (revisedMsg[i]) {
+                        case '\r':
+                        case '\n':
+                        case '\'':
+                        case '\"':
+                            revisedMsg[i] = ' ';
+                            break;
+                            // these characters are not valid both in database and in messages as a property
+                    }
+                }
+            }
+ 			if (revisedMsg != NULL) {
+                char *output = curl_easy_escape(curl, revisedMsg, strlen(revisedMsg));
+                if(output) {
+                    ss_url << WORKEREVENT_STATUSMSG << "=" << output << "&";
+                    curl_free(output);
+                }
 			}
 
 			ss_url << WORKEREVENT_PROGRESS << "=" << workerEvent->progress << "&";