mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

libtest: use curl_free() to free libcurl allocated data

Browse Source 
In several test programs. These mistakes are not detected or a problem
as long as memdebug.h is included, as that provides the debug wrappers
for all memory functions in the same style libcurl internals do it,
which makes curl_free and free effectively the same call.

Reported-by: Nicholas Nethercote
Closes #11746
This commit is contained in:
Daniel Stenberg 2023-08-28 08:29:15 +02:00
parent 89b3cbd0e0
commit a06de2b772
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest/lib539.c
View File

@ -70,7 +70,7 @@ int test(char *URL)
slist = curl_slist_append(NULL, "SYST"); slist = curl_slist_append(NULL, "SYST");
if(!slist) { if(!slist) {
free(newURL); curl_free(newURL);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();
return TEST_ERR_MAJOR_BAD; return TEST_ERR_MAJOR_BAD;
@ -85,7 +85,7 @@ int test(char *URL)
test_cleanup: test_cleanup:
curl_slist_free_all(slist); curl_slist_free_all(slist);
free(newURL); curl_free(newURL);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();

10
tests/libtest/lib568.c
View File

@ -75,7 +75,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
sdp = open(libtest_arg2, O_RDONLY); sdp = open(libtest_arg2, O_RDONLY);
@ -110,7 +110,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_DESCRIBE); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_DESCRIBE);
@ -126,7 +126,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
custom_headers = curl_slist_append(custom_headers, custom_headers = curl_slist_append(custom_headers,
@ -156,7 +156,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS);
@ -167,7 +167,7 @@ test_cleanup:
if(sdpf) if(sdpf)
fclose(sdpf); fclose(sdpf);
free(stream_uri); curl_free(stream_uri);
if(custom_headers) if(custom_headers)
curl_slist_free_all(custom_headers); curl_slist_free_all(custom_headers);

6
tests/libtest/lib569.c
View File

@ -85,7 +85,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
@ -105,7 +105,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_TEARDOWN); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_TEARDOWN);
@ -120,7 +120,7 @@ test_cleanup:
if(idfile) if(idfile)
fclose(idfile); fclose(idfile);
free(stream_uri); curl_free(stream_uri);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();

8
tests/libtest/lib570.c
View File

@ -63,7 +63,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@ -84,7 +84,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@ -99,7 +99,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@ -112,7 +112,7 @@ int test(char *URL)
} }
test_cleanup: test_cleanup:
free(stream_uri); curl_free(stream_uri);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();

10
tests/libtest/lib571.c
View File

@ -134,7 +134,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_INTERLEAVEFUNCTION, rtp_write); test_setopt(curl, CURLOPT_INTERLEAVEFUNCTION, rtp_write);
@ -156,7 +156,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY);
@ -171,7 +171,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_DESCRIBE); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_DESCRIBE);
@ -185,7 +185,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY);
@ -203,7 +203,7 @@ int test(char *URL)
} }
test_cleanup: test_cleanup:
free(stream_uri); curl_free(stream_uri);
if(protofile) if(protofile)
fclose(protofile); fclose(protofile);

12
tests/libtest/lib572.c
View File

@ -78,7 +78,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_TRANSPORT, "Planes/Trains/Automobiles"); test_setopt(curl, CURLOPT_RTSP_TRANSPORT, "Planes/Trains/Automobiles");
@ -93,7 +93,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
/* PUT style GET_PARAMETERS */ /* PUT style GET_PARAMETERS */
@ -128,7 +128,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@ -143,7 +143,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_GET_PARAMETER); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_GET_PARAMETER);
@ -162,7 +162,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri); test_setopt(curl, CURLOPT_RTSP_STREAM_URI, stream_uri);
free(stream_uri); curl_free(stream_uri);
stream_uri = NULL; stream_uri = NULL;
test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS); test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS);
@ -173,7 +173,7 @@ test_cleanup:
if(paramsf) if(paramsf)
fclose(paramsf); fclose(paramsf);
free(stream_uri); curl_free(stream_uri);
if(custom_headers) if(custom_headers)
curl_slist_free_all(custom_headers); curl_slist_free_all(custom_headers);

10
tests/libtest/lib661.c
View File

@ -52,7 +52,7 @@ int test(char *URL)
test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_SINGLECWD); test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_SINGLECWD);
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
free(newURL); curl_free(newURL);
newURL = aprintf("%s/folderB/661", URL); newURL = aprintf("%s/folderB/661", URL);
test_setopt(curl, CURLOPT_URL, newURL); test_setopt(curl, CURLOPT_URL, newURL);
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@ -67,7 +67,7 @@ int test(char *URL)
goto test_cleanup; goto test_cleanup;
} }
free(newURL); curl_free(newURL);
newURL = aprintf("%s/folderA/661", URL); newURL = aprintf("%s/folderA/661", URL);
test_setopt(curl, CURLOPT_URL, newURL); test_setopt(curl, CURLOPT_URL, newURL);
test_setopt(curl, CURLOPT_VERBOSE, 1L); test_setopt(curl, CURLOPT_VERBOSE, 1L);
@ -76,13 +76,13 @@ int test(char *URL)
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
/* curve ball: CWD /folderB before reusing connection with _NOCWD */ /* curve ball: CWD /folderB before reusing connection with _NOCWD */
free(newURL); curl_free(newURL);
newURL = aprintf("%s/folderB/661", URL); newURL = aprintf("%s/folderB/661", URL);
test_setopt(curl, CURLOPT_URL, newURL); test_setopt(curl, CURLOPT_URL, newURL);
test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_SINGLECWD); test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_SINGLECWD);
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
free(newURL); curl_free(newURL);
newURL = aprintf("%s/folderA/661", URL); newURL = aprintf("%s/folderA/661", URL);
test_setopt(curl, CURLOPT_URL, newURL); test_setopt(curl, CURLOPT_URL, newURL);
test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_NOCWD); test_setopt(curl, CURLOPT_FTP_FILEMETHOD, (long) CURLFTPMETHOD_NOCWD);
@ -144,7 +144,7 @@ int test(char *URL)
test_cleanup: test_cleanup:
curl_slist_free_all(slist); curl_slist_free_all(slist);
free(newURL); curl_free(newURL);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
curl_global_cleanup(); curl_global_cleanup();