mirror of
https://github.com/moparisthebest/curl
synced 2024-10-31 15:45:12 -04:00
e05de4f46d
This caused a null-pointer dereference which caused a few dozen torture tests to fail.
175 lines
4.7 KiB
C
175 lines
4.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2014, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#include "rawstr.h"
|
|
|
|
#define ENABLE_CURLX_PRINTF
|
|
/* use our own printf() functions */
|
|
#include "curlx.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_convert.h"
|
|
#include "tool_operhlp.h"
|
|
#include "tool_metalink.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
void clean_getout(struct OperationConfig *config)
|
|
{
|
|
struct getout *next;
|
|
struct getout *node = config->url_list;
|
|
|
|
while(node) {
|
|
next = node->next;
|
|
Curl_safefree(node->url);
|
|
Curl_safefree(node->outfile);
|
|
Curl_safefree(node->infile);
|
|
Curl_safefree(node);
|
|
node = next;
|
|
}
|
|
config->url_list = NULL;
|
|
}
|
|
|
|
bool output_expected(const char *url, const char *uploadfile)
|
|
{
|
|
if(!uploadfile)
|
|
return TRUE; /* download */
|
|
if(checkprefix("http://", url) || checkprefix("https://", url))
|
|
return TRUE; /* HTTP(S) upload */
|
|
|
|
return FALSE; /* non-HTTP upload, probably no output should be expected */
|
|
}
|
|
|
|
bool stdin_upload(const char *uploadfile)
|
|
{
|
|
return (curlx_strequal(uploadfile, "-") ||
|
|
curlx_strequal(uploadfile, ".")) ? TRUE : FALSE;
|
|
}
|
|
|
|
/*
|
|
* Adds the file name to the URL if it doesn't already have one.
|
|
* url will be freed before return if the returned pointer is different
|
|
*/
|
|
char *add_file_name_to_url(CURL *curl, char *url, const char *filename)
|
|
{
|
|
/* If no file name part is given in the URL, we add this file name */
|
|
char *ptr = strstr(url, "://");
|
|
if(ptr)
|
|
ptr += 3;
|
|
else
|
|
ptr = url;
|
|
ptr = strrchr(ptr, '/');
|
|
if(!ptr || !strlen(++ptr)) {
|
|
/* The URL has no file name part, add the local file name. In order
|
|
to be able to do so, we have to create a new URL in another
|
|
buffer.*/
|
|
|
|
/* We only want the part of the local path that is on the right
|
|
side of the rightmost slash and backslash. */
|
|
const char *filep = strrchr(filename, '/');
|
|
char *file2 = strrchr(filep?filep:filename, '\\');
|
|
char *encfile;
|
|
|
|
if(file2)
|
|
filep = file2 + 1;
|
|
else if(filep)
|
|
filep++;
|
|
else
|
|
filep = filename;
|
|
|
|
/* URL encode the file name */
|
|
encfile = curl_easy_escape(curl, filep, 0 /* use strlen */);
|
|
if(encfile) {
|
|
char *urlbuffer;
|
|
if(ptr)
|
|
/* there is a trailing slash on the URL */
|
|
urlbuffer = aprintf("%s%s", url, encfile);
|
|
else
|
|
/* there is no trailing slash on the URL */
|
|
urlbuffer = aprintf("%s/%s", url, encfile);
|
|
|
|
curl_free(encfile);
|
|
Curl_safefree(url);
|
|
|
|
if(!urlbuffer)
|
|
return NULL;
|
|
|
|
url = urlbuffer; /* use our new URL instead! */
|
|
}
|
|
else
|
|
Curl_safefree(url);
|
|
}
|
|
return url;
|
|
}
|
|
|
|
/* Extracts the name portion of the URL.
|
|
* Returns a pointer to a heap-allocated string or NULL if
|
|
* no name part, at location indicated by first argument.
|
|
*/
|
|
CURLcode get_url_file_name(char **filename, const char *url)
|
|
{
|
|
const char *pc;
|
|
|
|
*filename = NULL;
|
|
|
|
/* Find and get the remote file name */
|
|
pc = strstr(url, "://");
|
|
if(pc)
|
|
pc += 3;
|
|
else
|
|
pc = url;
|
|
pc = strrchr(pc, '/');
|
|
|
|
if(pc)
|
|
/* duplicate the string beyond the slash */
|
|
pc++;
|
|
else
|
|
/* no slash => empty string */
|
|
pc = "";
|
|
|
|
*filename = strdup(pc);
|
|
if(!*filename)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
/* in case we built debug enabled, we allow an environment variable
|
|
* named CURL_TESTDIR to prefix the given file name to put it into a
|
|
* specific directory
|
|
*/
|
|
#ifdef DEBUGBUILD
|
|
{
|
|
char *tdir = curlx_getenv("CURL_TESTDIR");
|
|
if(tdir) {
|
|
char buffer[512]; /* suitably large */
|
|
snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename);
|
|
Curl_safefree(*filename);
|
|
*filename = strdup(buffer); /* clone the buffer */
|
|
curl_free(tdir);
|
|
if(!*filename)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return CURLE_OK;
|
|
}
|