mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalise intermediary UCS-4 string when verifying ACE labels

This commit is contained in:
Chris Young 2014-05-30 20:19:46 +01:00 committed by Daniel Silverstone
parent db0856606a
commit eee7189f05
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/idna.c
View File

@ -487,15 +487,23 @@ static bool idna__verify(const char *label, size_t len)
char *ace;
size_t ucs4_len, ace_len;
/* Convert our ACE label back to UCS-4 */
error = idna__ace_to_ucs4(label, len,
&ucs4, &ucs4_len);
if (error != NSERROR_OK) return false;
/* Perform NFC normalisation */
ucs4_len = utf8proc_normalise(ucs4, ucs4_len,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if(ucs4_len < 0) return false;
/* Convert the UCS-4 label back to ACE */
error = idna__ucs4_to_ace(ucs4, ucs4_len,
&ace, &ace_len);
free(ucs4);
if (error != NSERROR_OK) return false;
/* Check if it matches the input */
if ((len == ace_len) && (strncmp(label, ace, len) == 0)) {
free(ace);
return true;