Loading tests/unit/unit1653.c +63 −16 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms Loading Loading @@ -40,106 +40,153 @@ unit_stop(void) curl_global_cleanup(); } UNITTEST_START #define free_and_clear(x) free(x); x = NULL UNITTEST_START { CURLUcode ret; char *ipv6port; char *ipv6port = NULL; char *portnum; /* Valid IPv6 */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, CURLU_NO_DEFAULT_PORT); fail_unless(ret != CURLUE_OK, "curl_url_get portnum returned something"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Invalid IPv6 */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15|"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff;fea7:da15]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with zone index and port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); fail_unless(strcmp(portnum, "80") == 0, "Check portnumber"); fail_unless(portnum && !strcmp(portnum, "80"), "Check portnumber"); curl_free(portnum); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with zone index without port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]:81"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); fail_unless(strcmp(portnum, "81") == 0, "Check portnumber"); fail_unless(portnum && !strcmp(portnum, "81"), "Check portnumber"); curl_free(portnum); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with syntax error in the port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15];81"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with no port after the colon, should use default */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]:"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Incorrect zone index syntax */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%!25eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Non percent-encoded zone index */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error"); fail: free(ipv6port); curl_url_cleanup(u); } UNITTEST_STOP Loading
tests/unit/unit1653.c +63 −16 Original line number Diff line number Diff line Loading @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms Loading Loading @@ -40,106 +40,153 @@ unit_stop(void) curl_global_cleanup(); } UNITTEST_START #define free_and_clear(x) free(x); x = NULL UNITTEST_START { CURLUcode ret; char *ipv6port; char *ipv6port = NULL; char *portnum; /* Valid IPv6 */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, CURLU_NO_DEFAULT_PORT); fail_unless(ret != CURLUE_OK, "curl_url_get portnum returned something"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Invalid IPv6 */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15|"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff;fea7:da15]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with zone index and port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); fail_unless(strcmp(portnum, "80") == 0, "Check portnumber"); fail_unless(portnum && !strcmp(portnum, "80"), "Check portnumber"); curl_free(portnum); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with zone index without port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]:81"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); fail_unless(strcmp(portnum, "81") == 0, "Check portnumber"); fail_unless(portnum && !strcmp(portnum, "81"), "Check portnumber"); curl_free(portnum); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with syntax error in the port number */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15];81"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Valid IPv6 with no port after the colon, should use default */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15]:"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Incorrect zone index syntax */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%!25eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error"); free(ipv6port); free_and_clear(ipv6port); curl_url_cleanup(u); /* Non percent-encoded zone index */ u = curl_url(); if(!u) goto fail; ipv6port = strdup("[fe80::250:56ff:fea7:da15%eth3]:80"); if(!ipv6port) goto fail; ret = Curl_parse_port(u, ipv6port); fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error"); fail: free(ipv6port); curl_url_cleanup(u); } UNITTEST_STOP