diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c index 98578173..ac6a23f3 100644 --- a/src/testcurl/perf_get.c +++ b/src/testcurl/perf_get.c @@ -207,7 +207,10 @@ testInternalGet (int port, int poll_flag) { MHD_stop_daemon (d); return 32; } port = (int)dinfo->port; } - sprintf(url, "http://127.0.0.1:%d/hello_world", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hello_world", + port); start_timer (); for (i=0;iport; } - sprintf(url, "http://127.0.0.1:%d/hello_world", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hello_world", + port); start_timer (); for (i=0;iport; } - sprintf(url, "http://127.0.0.1:%d/hello_world", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hello_world", + port); start_timer (); for (i=0;iport; } - sprintf(url, "http://127.0.0.1:%d/hello_world", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hello_world", + port); start_timer (); multi = curl_multi_init (); if (multi == NULL) diff --git a/src/testcurl/perf_get_concurrent.c b/src/testcurl/perf_get_concurrent.c index 49ed1ba4..e1c2e997 100644 --- a/src/testcurl/perf_get_concurrent.c +++ b/src/testcurl/perf_get_concurrent.c @@ -218,8 +218,10 @@ do_gets (void * param) int port = (int)(intptr_t)param; char *err = NULL; - sprintf(url, "http://127.0.0.1:%d/hello_world", port); - + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hello_world", + port); for (j=0;jport) - { MHD_stop_daemon (d); return 32; } + + dinfo = MHD_get_daemon_info (d, + MHD_DAEMON_INFO_BIND_PORT); + if ( (NULL == dinfo) || + (0 == dinfo->port) ) + { + MHD_stop_daemon (d); + return 32; + } port = (int)dinfo->port; } snprintf (url, diff --git a/src/testcurl/test_get_response_cleanup.c b/src/testcurl/test_get_response_cleanup.c index 8cb4f4a7..d3d45d2f 100644 --- a/src/testcurl/test_get_response_cleanup.c +++ b/src/testcurl/test_get_response_cleanup.c @@ -182,7 +182,10 @@ testInternalGet () { MHD_stop_daemon (d); return 32; } port = (int)dinfo->port; } - sprintf(url, "http://127.0.0.1:%d/", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/", + port); curl = fork_curl (url); (void)sleep (1); kill_curl (curl); @@ -227,7 +230,10 @@ testMultithreadedGet () { MHD_stop_daemon (d); return 32; } port = (int)dinfo->port; } - sprintf(url, "http://127.0.0.1:%d/", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/", + port); //fprintf (stderr, "Forking cURL!\n"); curl = fork_curl (url); (void)sleep (1); @@ -283,7 +289,10 @@ testMultithreadedPoolGet () { MHD_stop_daemon (d); return 32; } port = (int)dinfo->port; } - sprintf(url, "http://127.0.0.1:%d/", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/", + port); curl = fork_curl (url); (void)sleep (1); kill_curl (curl); @@ -332,7 +341,10 @@ testExternalGet () { MHD_stop_daemon (d); return 32; } port = (int)dinfo->port; } - sprintf(url, "http://127.0.0.1:%d/", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/", + port); curl = fork_curl (url); start = time (NULL); diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c index a312c205..c7e94945 100644 --- a/src/testcurl/test_get_sendfile.c +++ b/src/testcurl/test_get_sendfile.c @@ -584,11 +584,12 @@ main (int argc, char *const *argv) (NULL == (tmp = getenv ("TEMP"))) ) tmp = "/tmp"; sourcefile = malloc (strlen (tmp) + 32); - sprintf (sourcefile, - "%s/%s%s", - tmp, - "test-mhd-sendfile", - oneone ? "11" : ""); + snprintf (sourcefile, + strlen (tmp) + 32, + "%s/%s%s", + tmp, + "test-mhd-sendfile", + oneone ? "11" : ""); f = fopen (sourcefile, "w"); if (NULL == f) { diff --git a/src/testcurl/test_post_loop.c b/src/testcurl/test_post_loop.c index 5ed57431..6da06b45 100644 --- a/src/testcurl/test_post_loop.c +++ b/src/testcurl/test_post_loop.c @@ -93,7 +93,7 @@ ahc_echo (void *cls, { if (*mptr != &marker) abort (); - response = MHD_create_response_from_buffer (2, "OK", + response = MHD_create_response_from_buffer (2, "OK", MHD_RESPMEM_PERSISTENT); ret = MHD_queue_response (connection, MHD_HTTP_OK, response); MHD_destroy_response (response); @@ -150,7 +150,11 @@ testInternalPost () c = curl_easy_init (); cbc.pos = 0; buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:%d/hw%d", port, i); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hw%d", + port, + i); curl_easy_setopt (c, CURLOPT_URL, url); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); @@ -214,7 +218,9 @@ testMultithreadedPost () cbc.buf = buf; cbc.size = 2048; d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, - port, NULL, NULL, &ahc_echo, NULL, MHD_OPTION_END); + port, NULL, NULL, + &ahc_echo, NULL, + MHD_OPTION_END); if (d == NULL) return 16; if (0 == port) @@ -232,7 +238,11 @@ testMultithreadedPost () c = curl_easy_init (); cbc.pos = 0; buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:%d/hw%d", port, i); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hw%d", + port, + i); curl_easy_setopt (c, CURLOPT_URL, url); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); @@ -315,7 +325,11 @@ testMultithreadedPoolPost () c = curl_easy_init (); cbc.pos = 0; buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:%d/hw%d", port, i); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hw%d", + port, + i); curl_easy_setopt (c, CURLOPT_URL, url); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); @@ -421,7 +435,11 @@ testExternalPost () c = curl_easy_init (); cbc.pos = 0; buf[0] = '\0'; - sprintf (url, "http://127.0.0.1:%d/hw%d", port, i); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d/hw%d", + port, + i); curl_easy_setopt (c, CURLOPT_URL, url); curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc); @@ -490,7 +508,7 @@ testExternalPost () fprintf (stderr, "select failed: %s\n", strerror (errno)); - break; + break; } while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform (multi, &running)); @@ -540,11 +558,11 @@ static unsigned long long start_time; /** - * Get the current timestamp + * Get the current timestamp * * @return current time in ms */ -static unsigned long long +static unsigned long long now () { struct timeval tv; diff --git a/src/testcurl/test_quiesce_stream.c b/src/testcurl/test_quiesce_stream.c index 5d80ee70..bccb5890 100644 --- a/src/testcurl/test_quiesce_stream.c +++ b/src/testcurl/test_quiesce_stream.c @@ -220,7 +220,10 @@ main(void) { MHD_stop_daemon (daemon); return 32; } port = (int)dinfo->port; } - sprintf(command_line, "curl -s http://127.0.0.1:%d", port); + snprintf (command_line, + sizeof (command_line), + "curl -s http://127.0.0.1:%d", + port); if (0 != system (command_line)) { diff --git a/src/testcurl/test_termination.c b/src/testcurl/test_termination.c index 6f633c84..5be74303 100644 --- a/src/testcurl/test_termination.c +++ b/src/testcurl/test_termination.c @@ -94,6 +94,8 @@ main (void) { struct MHD_Daemon *daemon; int port; + char url[255]; + CURL *curl; if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) port = 0; @@ -120,10 +122,12 @@ main (void) port = (int)dinfo->port; } - CURL *curl = curl_easy_init (); + curl = curl_easy_init (); /* curl_easy_setopt(curl, CURLOPT_POST, 1L); */ - char url[255]; - sprintf (url, "http://127.0.0.1:%d", port); + snprintf (url, + sizeof (url), + "http://127.0.0.1:%d", + port); curl_easy_setopt (curl, CURLOPT_URL, url); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, write_data);