mirror of
https://github.com/curl/curl.git
synced 2026-04-13 12:41:42 +08:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
245 lines
6.8 KiB
C
245 lines
6.8 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 AND ISC
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "../curl_setup.h"
|
|
|
|
#ifdef USE_SSH
|
|
|
|
#include "vssh.h"
|
|
#include <curl/curl.h>
|
|
#include "../curlx/strparse.h"
|
|
#include "../curl_trc.h"
|
|
#include "../escape.h"
|
|
|
|
#define MAX_SSHPATH_LEN 100000 /* arbitrary */
|
|
|
|
/* figure out the path to work with in this particular request */
|
|
CURLcode Curl_getworkingpath(struct Curl_easy *data,
|
|
char *homedir, /* when SFTP is used */
|
|
char **path) /* returns the allocated
|
|
real path to work with */
|
|
{
|
|
char *working_path;
|
|
size_t working_path_len;
|
|
struct dynbuf npath;
|
|
CURLcode result =
|
|
Curl_urldecode(data->state.up.path, 0, &working_path,
|
|
&working_path_len, REJECT_ZERO);
|
|
if(result)
|
|
return result;
|
|
|
|
/* new path to switch to in case we need to */
|
|
curlx_dyn_init(&npath, MAX_SSHPATH_LEN);
|
|
|
|
/* Check for /~/, indicating relative to the user's home directory */
|
|
if((data->conn->handler->protocol & CURLPROTO_SCP) &&
|
|
(working_path_len > 3) && (!memcmp(working_path, "/~/", 3))) {
|
|
/* It is referenced to the home directory, so strip the leading '/~/' */
|
|
if(curlx_dyn_addn(&npath, &working_path[3], working_path_len - 3)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
else if((data->conn->handler->protocol & CURLPROTO_SFTP) &&
|
|
(!strcmp("/~", working_path) ||
|
|
((working_path_len > 2) && !memcmp(working_path, "/~/", 3)))) {
|
|
if(curlx_dyn_add(&npath, homedir)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
if(working_path_len > 2) {
|
|
size_t len;
|
|
const char *p;
|
|
int copyfrom = 3;
|
|
/* Copy a separating '/' if homedir does not end with one */
|
|
len = curlx_dyn_len(&npath);
|
|
p = curlx_dyn_ptr(&npath);
|
|
if(len && (p[len-1] != '/'))
|
|
copyfrom = 2;
|
|
|
|
if(curlx_dyn_addn(&npath, &working_path[copyfrom],
|
|
working_path_len - copyfrom)) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
else {
|
|
if(curlx_dyn_add(&npath, "/")) {
|
|
curlx_free(working_path);
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
}
|
|
|
|
if(curlx_dyn_len(&npath)) {
|
|
curlx_free(working_path);
|
|
|
|
/* store the pointer for the caller to receive */
|
|
*path = curlx_dyn_ptr(&npath);
|
|
}
|
|
else
|
|
*path = working_path;
|
|
DEBUGASSERT(*path && (*path)[0]);
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#define MAX_PATHLENGTH 65535 /* arbitrary long */
|
|
|
|
CURLcode Curl_get_pathname(const char **cpp, char **path, const char *homedir)
|
|
{
|
|
const char *cp = *cpp;
|
|
struct dynbuf out;
|
|
CURLcode result;
|
|
|
|
DEBUGASSERT(homedir);
|
|
*path = NULL;
|
|
*cpp = NULL;
|
|
if(!*cp || !homedir)
|
|
return CURLE_QUOTE_ERROR;
|
|
|
|
curlx_dyn_init(&out, MAX_PATHLENGTH);
|
|
|
|
/* Ignore leading whitespace */
|
|
curlx_str_passblanks(&cp);
|
|
|
|
/* Check for quoted filenames */
|
|
if(*cp == '\"' || *cp == '\'') {
|
|
char quot = *cp++;
|
|
|
|
/* Search for terminating quote, unescape some chars */
|
|
while(*cp != quot) {
|
|
if(!*cp) /* End of string */
|
|
goto fail;
|
|
|
|
if(*cp == '\\') { /* Escaped characters */
|
|
cp++;
|
|
if(*cp != '\'' && *cp != '\"' && *cp != '\\')
|
|
goto fail;
|
|
}
|
|
result = curlx_dyn_addn(&out, cp, 1);
|
|
if(result)
|
|
return result;
|
|
cp++;
|
|
}
|
|
cp++; /* pass the end quote */
|
|
|
|
if(!curlx_dyn_len(&out))
|
|
goto fail;
|
|
|
|
}
|
|
else {
|
|
struct Curl_str word;
|
|
bool content = FALSE;
|
|
int rc;
|
|
/* Handling for relative path - prepend home directory */
|
|
if(cp[0] == '/' && cp[1] == '~' && cp[2] == '/') {
|
|
result = curlx_dyn_add(&out, homedir);
|
|
if(!result)
|
|
result = curlx_dyn_addn(&out, "/", 1);
|
|
if(result)
|
|
return result;
|
|
cp += 3;
|
|
content = TRUE;
|
|
}
|
|
/* Read to end of filename - either to whitespace or terminator */
|
|
rc = curlx_str_word(&cp, &word, MAX_PATHLENGTH);
|
|
if(rc) {
|
|
if(rc == STRE_BIG) {
|
|
curlx_dyn_free(&out);
|
|
return CURLE_TOO_LARGE;
|
|
}
|
|
else if(!content)
|
|
/* no path, no word, this is incorrect */
|
|
goto fail;
|
|
}
|
|
else {
|
|
/* append the word */
|
|
result = curlx_dyn_addn(&out, curlx_str(&word), curlx_strlen(&word));
|
|
if(result)
|
|
return result;
|
|
}
|
|
}
|
|
/* skip whitespace */
|
|
curlx_str_passblanks(&cp);
|
|
|
|
/* return pointer to second parameter if it exists */
|
|
*cpp = cp;
|
|
|
|
*path = curlx_dyn_ptr(&out);
|
|
return CURLE_OK;
|
|
|
|
fail:
|
|
curlx_dyn_free(&out);
|
|
return CURLE_QUOTE_ERROR;
|
|
}
|
|
|
|
CURLcode Curl_ssh_range(struct Curl_easy *data,
|
|
const char *p, curl_off_t filesize,
|
|
curl_off_t *startp, curl_off_t *sizep)
|
|
{
|
|
curl_off_t from, to;
|
|
int to_t;
|
|
int from_t = curlx_str_number(&p, &from, CURL_OFF_T_MAX);
|
|
if(from_t == STRE_OVERFLOW)
|
|
return CURLE_RANGE_ERROR;
|
|
curlx_str_passblanks(&p);
|
|
(void)curlx_str_single(&p, '-');
|
|
|
|
to_t = curlx_str_numblanks(&p, &to);
|
|
if((to_t == STRE_OVERFLOW) || (to_t && from_t) || *p)
|
|
return CURLE_RANGE_ERROR;
|
|
|
|
if(from_t) {
|
|
/* no start point given, set from relative to end of file */
|
|
if(!to)
|
|
/* "-0" is not a fine range */
|
|
return CURLE_RANGE_ERROR;
|
|
else if(to > filesize)
|
|
to = filesize;
|
|
from = filesize - to;
|
|
to = filesize - 1;
|
|
}
|
|
else if(from > filesize) {
|
|
failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"
|
|
FMT_OFF_T ")", from, filesize);
|
|
return CURLE_RANGE_ERROR;
|
|
}
|
|
else if((to_t == STRE_NO_NUM) || (to >= filesize))
|
|
to = filesize - 1;
|
|
|
|
if(from > to) {
|
|
failf(data, "Bad range: start offset larger than end offset");
|
|
return CURLE_RANGE_ERROR;
|
|
}
|
|
if((to - from) == CURL_OFF_T_MAX)
|
|
return CURLE_RANGE_ERROR;
|
|
|
|
*startp = from;
|
|
*sizep = to - from + 1;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif /* if SSH is used */
|