Commit aab33215 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

URL parser: reject non-numerical port numbers 

Test 1281 added to verify
parent 42253ad9

lib/url.c

+6 −1
Original line number Diff line number Diff line
@@ -5453,12 +5453,17 @@ static CURLcode parse_remote_port(struct Curl_easy *data, 
      *portptr = '\0'; /* cut off the name there */

      conn->remote_port = curlx_ultous(port);

    }

    else

    else {

      if(rest[0]) {

        failf(data, "Illegal port number");

        return CURLE_URL_MALFORMAT;

      }

      /* Browser behavior adaptation. If there's a colon with no digits after,

         just cut off the name there which makes us ignore the colon and just

         use the default port. Firefox and Chrome both do that. */

      *portptr = '\0';

    }

  }



  /* only if remote_port was not already parsed off the URL we use the

     default port number */

tests/data/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ 
test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \

test1244 test1245 test1246 test1247 \

\

test1280 \

test1280 test1281 \

\

test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \

test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \

tests/data/test1281

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

URL

</keywords>

</info>



#

# Server-side

<reply>

<data>

</data>

</reply>



# Client-side

<client>

<server>

none

</server>

 <name>

reject non-numerical port number in URL

 </name>

 <command>

http://%HOSTIP:alpha/beta/1281

</command>

</client>



# Verify data after the test has been "shot"

<verify>

# 3 == CURLE_URL_MALFORMAT

<errorcode>

3

</errorcode>

</verify>

</testcase>