Revert "Update to 7.44.0"

[platform/upstream/curl.git] / tests / server / rtspd.c

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 0293f59..72422ec 100644 (file)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -523,7 +523,8 @@ static int ProcessRequest(struct httprequest *req)
           } while(ptr && *ptr);
           logmsg("Done parsing server commands");
         }
-        free(cmd);
+        if(cmd)
+          free(cmd);
       }
     }
     else {
@@ -992,7 +993,8 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
     }
 
     if(got_exit_signal) {
-      free(ptr);
+      if(ptr)
+        free(ptr);
       return -1;
     }
 
@@ -1003,7 +1005,8 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
       logmsg("fopen() failed with error: %d %s", error, strerror(error));
       logmsg("Error opening file: %s", filename);
       logmsg("Couldn't open test file");
-      free(ptr);
+      if(ptr)
+        free(ptr);
       return 0;
     }
     else {
@@ -1012,15 +1015,18 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
       fclose(stream);
       if(error) {
         logmsg("getpart() failed with error: %d", error);
-        free(ptr);
+        if(ptr)
+          free(ptr);
         return 0;
       }
     }
   }
 
   if(got_exit_signal) {
-    free(ptr);
-    free(cmd);
+    if(ptr)
+      free(ptr);
+    if(cmd)
+      free(cmd);
     return -1;
   }
 
@@ -1044,8 +1050,10 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
     logmsg("fopen() failed with error: %d %s", error, strerror(error));
     logmsg("Error opening file: %s", RESPONSE_DUMP);
     logmsg("couldn't create logfile: " RESPONSE_DUMP);
-    free(ptr);
-    free(cmd);
+    if(ptr)
+      free(ptr);
+    if(cmd)
+      free(cmd);
     return -1;
   }
 
@@ -1102,22 +1110,28 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
            RESPONSE_DUMP, error, strerror(error));
 
   if(got_exit_signal) {
-    free(ptr);
-    free(cmd);
+    if(ptr)
+      free(ptr);
+    if(cmd)
+      free(cmd);
     return -1;
   }
 
   if(sendfailure) {
     logmsg("Sending response failed. Only (%zu bytes) of (%zu bytes) were sent",
            responsesize-count, responsesize);
-    free(ptr);
-    free(cmd);
+    if(ptr)
+      free(ptr);
+    if(cmd)
+      free(cmd);
     return -1;
   }
 
   logmsg("Response sent (%zu bytes) and written to " RESPONSE_DUMP,
          responsesize);
-  free(ptr);
+
+  if(ptr)
+    free(ptr);
 
   if(cmdsize > 0 ) {
     char command[32];
@@ -1155,7 +1169,9 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
         ptr = NULL;
     } while(ptr && *ptr);
   }
-  free(cmd);
+  if(cmd)
+    free(cmd);
+
   req->open = persistant;
 
   prevtestno = req->testno;