mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-08 20:12:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

stop idna (en/de)code asploding when the passed host begins with a .

Browse Source
This commit is contained in:
Vincent Sanders 2014-06-10 23:37:27 +01:00
parent 2462f5658e
commit 16dea2e2bd
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/idna.c
View File

@ -600,7 +600,12 @@ idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_len)
char fqdn[256]; char fqdn[256];
char *output, *fqdn_p = fqdn; char *output, *fqdn_p = fqdn;
while ((label_len = idna__host_label_length(host, len)) != 0) { label_len = idna__host_label_length(host, len);
if (label_len == 0) {
return NSERROR_BAD_URL;
}
while (label_len != 0) {
if (idna__is_ldh(host, label_len) == false) { if (idna__is_ldh(host, label_len) == false) {
/* This string is IDN or invalid */ /* This string is IDN or invalid */
@ -649,6 +654,8 @@ idna_encode(const char *host, size_t len, char **ace_host, size_t *ace_len)
} }
host++; host++;
len = len - label_len - 1; len = len - label_len - 1;
label_len = idna__host_label_length(host, len);
} }
fqdn_p--; fqdn_p--;
@ -670,7 +677,12 @@ idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *host_len)
char fqdn[256]; char fqdn[256];
char *output, *fqdn_p = fqdn; char *output, *fqdn_p = fqdn;
while ((label_len = idna__host_label_length(ace_host, ace_len)) != 0) { label_len = idna__host_label_length(ace_host, ace_len);
if (label_len == 0) {
return NSERROR_BAD_URL;
}
while (label_len != 0) {
if (idna__is_ace(ace_host, label_len) == true) { if (idna__is_ace(ace_host, label_len) == true) {
/* This string is DNS-valid and (probably) encoded */ /* This string is DNS-valid and (probably) encoded */
@ -705,9 +717,13 @@ idna_decode(const char *ace_host, size_t ace_len, char **host, size_t *host_len)
fqdn_len++; fqdn_len++;
ace_host += label_len; ace_host += label_len;
if ((*ace_host == '\0') || (*ace_host == ':')) break; if ((*ace_host == '\0') || (*ace_host == ':')) {
break;
}
ace_host++; ace_host++;
ace_len = ace_len - label_len - 1; ace_len = ace_len - label_len - 1;
label_len = idna__host_label_length(ace_host, ace_len);
} }
fqdn_p--; fqdn_p--;