Author: tlsa
Date: Mon Oct 31 17:17:05 2011
New Revision: 13107
URL:
http://source.netsurf-browser.org?rev=13107&view=rev
Log:
Test numbers before calling strncmp.
Modified:
trunk/netsurf/utils/nsurl.c
Modified: trunk/netsurf/utils/nsurl.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/utils/nsurl.c?rev=13107&a...
==============================================================================
--- trunk/netsurf/utils/nsurl.c (original)
+++ trunk/netsurf/utils/nsurl.c Mon Oct 31 17:17:05 2011
@@ -853,14 +853,13 @@
1 : 0;
sec_start = norm_start + colon - pegs->at +
skip;
- if (url->scheme != NULL &&
+ if (url->scheme != NULL && length -
+ (colon - pegs->at + 1) == 2 &&
+ *sec_start == '8' &&
+ *(sec_start + 1) == '0' &&
strncmp(lwc_string_data(
url->scheme), "http",
- SLEN("http")) == 0 &&
- length -
- (colon - pegs->at + 1) == 2 &&
- *sec_start == '8' &&
- *(sec_start + 1) == '0') {
+ SLEN("http")) == 0) {
/* Scheme is http, and port is default
* (80) */
flags |= NSURL_F_NO_PORT;