← Commit list

f9b9d3b141

Daniel Stenberg
Daniel Stenberg
2026-05-16
SUCCESS Duration: 253s

Subject

urlapi: handle redirect without set scheme with default-scheme

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/urlapi.c +4 -1tests/data/Makefile.am +1 -1tests/data/test1921 +30 -0tests/libtest/Makefile.inc +1 -1tests/libtest/lib1921.c +52 -0
lib/urlapi.c+4 -1
@@ -1231,9 +1231,12 @@ static CURLUcode redirect_url(const char *base, const char *relurl,
const char *cutoff = NULL;
size_t prelen;
CURLUcode uc;
+ /* this can get here with a NULL u->scheme only if asked to use the default
+ scheme, so allow fallback to that */
+ const char *scheme = u->scheme ? u->scheme : DEFAULT_SCHEME;
/* protsep points to the start of the hostname, after [scheme]:// */
- const char *protsep = base + strlen(u->scheme) + 3;
+ const char *protsep = base + strlen(scheme) + 3;
DEBUGASSERT(base && relurl && u); /* all set here */
if(!base)
return CURLUE_MALFORMED_INPUT; /* should never happen */
tests/data/Makefile.am+1 -1
@@ -235,7 +235,7 @@ test1800 test1801 test1802 test1847 test1848 test1849 test1850 test1851 \
\
test1900 test1901 test1902 test1903 test1904 test1905 test1906 test1907 \
test1908 test1909 test1910 test1911 test1912 test1913 test1914 test1915 \
-test1916 test1917 test1918 test1919 test1920 \
+test1916 test1917 test1918 test1919 test1920 test1921 \
\
test1933 test1934 test1935 test1936 test1937 test1938 test1939 test1940 \
test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \
tests/data/test1921+30 -0
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<testcase>
+<info>
+<keywords>
+urlapi
+</keywords>
+</info>
+
+# Client-side
+<client>
+
+<name>
+Set a URL without scheme, then redirect with default scheme
+</name>
+<tool>
+lib%TESTNUMBER
+</tool>
+
+<command>
+-
+</command>
+</client>
+
+<verify>
+<stdout mode="text">
+URL: https://example.com/newpath
+</stdout>
+</verify>
+
+</testcase>
tests/libtest/Makefile.inc+1 -1
@@ -102,7 +102,7 @@ TESTS_C = \
lib1662.c \
lib1900.c lib1901.c lib1902.c lib1903.c lib1905.c lib1906.c lib1907.c \
lib1908.c lib1910.c lib1911.c lib1912.c lib1913.c \
- lib1915.c lib1916.c lib1918.c lib1919.c lib1920.c \
+ lib1915.c lib1916.c lib1918.c lib1919.c lib1920.c lib1921.c \
lib1933.c lib1934.c lib1935.c lib1936.c lib1937.c lib1938.c lib1939.c \
lib1940.c lib1945.c \
lib1947.c lib1948.c \
tests/libtest/lib1921.c+52 -0
@@ -0,0 +1,52 @@
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) Daniel Stenberg, <[email protected]>, 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 "first.h"
+
+static CURLcode test_lib1921(const char *URL)
+{
+ CURLU *u = curl_url();
+ CURLUcode rc;
+ if(!u)
+ return CURLE_FAILED_INIT;
+ (void)URL; /* unused */
+ /* u->scheme remains NULL */
+ rc = curl_url_set(u, CURLUPART_HOST, "example.com", 0);
+ if(!rc)
+ rc = curl_url_set(u, CURLUPART_PATH, "/original", 0);
+
+ if(!rc)
+ /* Relative URL + CURLU_DEFAULT_SCHEME reaches redirect_url() */
+ rc = curl_url_set(u, CURLUPART_URL, "/newpath", CURLU_DEFAULT_SCHEME);
+
+ if(!rc) {
+ char *url;
+ rc = curl_url_get(u, CURLUPART_URL, &url, 0);
+ if(!rc) {
+ curl_mprintf("URL: %s\n", url);
+ curl_free(url);
+ }
+ }
+ curl_url_cleanup(u);
+ return rc ? CURLE_BAD_FUNCTION_ARGUMENT : CURLE_OK;
+}