romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 17:03:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

CURLU: fix NULL dereference when used over proxy

Browse source 
Test 659 verifies

Also fixed the test 658 name

Closes #3641
This commit is contained in:
Daniel Stenberg 2019-03-04 12:03:39 +01:00
parent 2591a491aa
commit 15401fa886
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 140 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/libtest/Makefile.inc
View file

@ -22,6 +22,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \
lib583 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 lib599 \
lib643 lib644 lib645 lib650 lib651 lib652 lib653 lib654 lib655 lib658 \
lib659 \
lib1156 \
lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \
lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \
@ -345,6 +346,10 @@ lib658_SOURCES = lib658.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib658_LDADD = $(TESTUTIL_LIBS)
lib658_CPPFLAGS = $(AM_CPPFLAGS)
lib659_SOURCES = lib659.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib659_LDADD = $(TESTUTIL_LIBS)
lib659_CPPFLAGS = $(AM_CPPFLAGS)
lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL)
lib1500_LDADD = $(TESTUTIL_LIBS)
lib1500_CPPFLAGS = $(AM_CPPFLAGS)

75
tests/libtest/lib659.c Normal file
View file

@ -0,0 +1,75 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* 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
* are also available at https://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 "test.h"
#include "testutil.h"
#include "warnless.h"
#include "memdebug.h"
/*
* Get a single URL without select().
*/
int test(char *URL)
{
CURL *handle = NULL;
CURLcode res = 0;
CURLU *urlp = NULL;
global_init(CURL_GLOBAL_ALL);
easy_init(handle);
urlp = curl_url();
if(!urlp) {
fprintf(stderr, "problem init URL api.");
goto test_cleanup;
}
/* this doesn't set the PATH part */
if(curl_url_set(urlp, CURLUPART_HOST, "www.example.com", 0) ||
curl_url_set(urlp, CURLUPART_SCHEME, "http", 0) ||
curl_url_set(urlp, CURLUPART_PORT, "80", 0)) {
fprintf(stderr, "problem setting CURLUPART");
goto test_cleanup;
}
easy_setopt(handle, CURLOPT_CURLU, urlp);
easy_setopt(handle, CURLOPT_VERBOSE, 1L);
easy_setopt(handle, CURLOPT_PROXY, URL);
res = curl_easy_perform(handle);
if(res) {
fprintf(stderr, "%s:%d curl_easy_perform() failed with code %d (%s)\n",
__FILE__, __LINE__, res, curl_easy_strerror(res));
goto test_cleanup;
}
test_cleanup:
curl_url_cleanup(urlp);
curl_easy_cleanup(handle);
curl_global_cleanup();
return res;
}