mirror of
https://github.com/curl/curl.git
synced 2024-12-15 06:40:09 +08:00
4cfa5bcc9a
- move host checks together - simplify the scheme parser loop and the end of host name parser - avoid itermediate buffer storing in multiple places - reduce scope for several variables - skip the Curl_dyn_tail() call for speed - detect IPv6 earlier and skip extra checks for such hosts - normalize directly in dynbuf instead of itermediate buffer - split out the IPv6 parser into its own funciton - call the IPv6 parser directly for ipv6 addresses - remove (unused) special treatment of % in host names - junkscan() once in the beginning instead of scattered - make junkscan return error code - remove unused query management from dedotdotify() - make Curl_parse_login_details use memchr - more use of memchr() instead of strchr() and less strlen() calls - make junkscan check and return the URL length An optimized build runs one of my benchmark URL parsing programs ~41% faster using this branch. (compared against the shipped 7.88.1 library in Debian) Closes #10935
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
/* copied from urlapi.c */
|
|
extern int dedotdotify(const char *input, size_t clen, char **out);
|
|
|
|
#include "memdebug.h"
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
struct dotdot {
|
|
const char *input;
|
|
const char *output;
|
|
};
|
|
|
|
UNITTEST_START
|
|
|
|
unsigned int i;
|
|
int fails = 0;
|
|
const struct dotdot pairs[] = {
|
|
{ "/a/b/c/./../../g", "/a/g" },
|
|
{ "mid/content=5/../6", "mid/6" },
|
|
{ "/hello/../moo", "/moo" },
|
|
{ "/1/../1", "/1" },
|
|
{ "/1/./1", "/1/1" },
|
|
{ "/1/..", "/" },
|
|
{ "/1/.", "/1/" },
|
|
{ "/1/./..", "/" },
|
|
{ "/1/./../2", "/2" },
|
|
{ "/hello/1/./../2", "/hello/2" },
|
|
{ "test/this", NULL },
|
|
{ "test/this/../now", "test/now" },
|
|
{ "/1../moo../foo", "/1../moo../foo"},
|
|
{ "/../../moo", "/moo"},
|
|
{ "/../../moo?", "/moo?"},
|
|
{ "/123?", NULL},
|
|
{ "/../moo/..?", "/" },
|
|
{ "/", NULL },
|
|
{ "", NULL },
|
|
{ "/.../", "/.../" },
|
|
{ "./moo", "moo" },
|
|
{ "../moo", "moo" },
|
|
{ "/.", "/" },
|
|
{ "/..", "/" },
|
|
{ "/moo/..", "/" },
|
|
{ "/..", "/" },
|
|
{ "/.", "/" },
|
|
};
|
|
|
|
for(i = 0; i < sizeof(pairs)/sizeof(pairs[0]); i++) {
|
|
char *out;
|
|
int err = dedotdotify(pairs[i].input, strlen(pairs[i].input), &out);
|
|
abort_unless(err == 0, "returned error");
|
|
abort_if(err && out, "returned error with output");
|
|
|
|
if(out && strcmp(out, pairs[i].output)) {
|
|
fprintf(stderr, "Test %u: '%s' gave '%s' instead of '%s'\n",
|
|
i, pairs[i].input, out, pairs[i].output);
|
|
fail("Test case output mismatched");
|
|
fails++;
|
|
}
|
|
else if(!out && pairs[i].output) {
|
|
fprintf(stderr, "Test %u: '%s' gave '%s' instead of NULL\n",
|
|
i, pairs[i].input, out);
|
|
fail("Test case output mismatched");
|
|
fails++;
|
|
}
|
|
else
|
|
fprintf(stderr, "Test %u: OK\n", i);
|
|
free(out);
|
|
}
|
|
|
|
fail_if(fails, "output mismatched");
|
|
|
|
UNITTEST_STOP
|