walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Code cleanup in libidn2 branch of _psl_idna_toASCII() 

Reported-by: https://github.com/daurnimator
This commit is contained in:
Tim Rühsen 2016-09-26 10:13:43 +02:00
parent 7eb8592035
commit 5ebc24f0e0
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/psl.c
View File

@ -718,33 +718,20 @@ static int _psl_idna_toASCII(_psl_idna_t *idna _UNUSED, const char *utf8, char *
} }
#elif defined(WITH_LIBIDN2) #elif defined(WITH_LIBIDN2)
int rc; int rc;
uint8_t *lower, resbuf[256]; uint8_t *lower;
size_t len = sizeof(resbuf) - 1; /* leave space for additional \0 byte */ size_t len = u8_strlen((uint8_t *)utf8) + 1;
/* we need a conversion to lowercase */ /* we need a conversion to lowercase */
lower = u8_tolower((uint8_t *)utf8, u8_strlen((uint8_t *)utf8), 0, UNINORM_NFKC, resbuf, &len); if (!(lower = u8_tolower((uint8_t *)utf8, len, 0, UNINORM_NFKC, NULL, &len))) {
if (!lower) {
/* fprintf(stderr, "u8_tolower(%s) failed (%d)\n", utf8, errno); */ /* fprintf(stderr, "u8_tolower(%s) failed (%d)\n", utf8, errno); */
return -1; return -1;
} }
/* u8_tolower() does not terminate the result string */
if (lower == resbuf) {
lower[len]=0;
} else {
uint8_t *tmp = lower;
lower = (uint8_t *)strndup((char *)lower, len);
free(tmp);
if (!lower)
return -1;
}
if ((rc = idn2_lookup_u8(lower, (uint8_t **)ascii, 0)) == IDN2_OK) { if ((rc = idn2_lookup_u8(lower, (uint8_t **)ascii, 0)) == IDN2_OK) {
ret = 0; ret = 0;
} /* else } /* else
fprintf(stderr, "toASCII(%s) failed (%d): %s\n", lower, rc, idn2_strerror(rc)); */ fprintf(stderr, "toASCII(%s) failed (%d): %s\n", lower, rc, idn2_strerror(rc)); */
if (lower != resbuf)
free(lower); free(lower);
#elif defined(WITH_LIBIDN) #elif defined(WITH_LIBIDN)
int rc; int rc;
@ -1738,9 +1725,8 @@ out:
* u8_tolower() does not terminate the result string, so include terminating 0 byte in len. */ * u8_tolower() does not terminate the result string, so include terminating 0 byte in len. */
size_t len = u8_strlen((uint8_t *)str) + 1; size_t len = u8_strlen((uint8_t *)str) + 1;
ret = PSL_SUCCESS;
if ((tmp = u8_tolower((uint8_t *)str, len, 0, UNINORM_NFKC, NULL, &len))) { if ((tmp = u8_tolower((uint8_t *)str, len, 0, UNINORM_NFKC, NULL, &len))) {
ret = PSL_SUCCESS;
if (lower) { if (lower) {
*lower = tmp; *lower = tmp;
tmp = NULL; tmp = NULL;