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

Skip conversion in _psl_is_public_suffix() for builtin psl context

This commit is contained in:
Tim Rühsen 2016-11-06 11:59:36 +01:00
parent 44e6bd4eb8
commit 2c871b1306
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/psl.c
View File

@ -177,7 +177,7 @@ struct _psl_ctx_st {
nsuffixes, nsuffixes,
nexceptions, nexceptions,
nwildcards; nwildcards;
unsigned char unsigned
utf8 : 1; /* 1: data contains UTF-8 + punycode encoded rules */ utf8 : 1; /* 1: data contains UTF-8 + punycode encoded rules */
}; };
@ -619,7 +619,7 @@ static int _domain_to_punycode(const char *domain, char *out, size_t outsize)
} }
#endif #endif
static inline int _isspace_ascii(const char c) static int _isspace_ascii(const char c)
{ {
return c == ' ' || c == '\t' || c == '\r' || c == '\n'; return c == ' ' || c == '\t' || c == '\r' || c == '\n';
} }
@ -803,7 +803,7 @@ static int _psl_is_public_suffix(const psl_ctx_t *psl, const char *domain, int t
for (p = domain; *p; p++) { for (p = domain; *p; p++) {
if (*p == '.') if (*p == '.')
suffix.nlabels++; suffix.nlabels++;
else if (!psl->utf8 && *((unsigned char *)p) >= 128) else if (*((unsigned char *)p) >= 128)
need_conversion = 1; /* in case domain is non-ascii we need a toASCII conversion */ need_conversion = 1; /* in case domain is non-ascii we need a toASCII conversion */
} }
@ -814,6 +814,14 @@ static int _psl_is_public_suffix(const psl_ctx_t *psl, const char *domain, int t
return 1; return 1;
} }
if (psl->utf8 || psl == &_builtin_psl)
need_conversion = 0;
#if defined(WITH_LIBIDN) || defined(WITH_LIBIDN2) || defined(WITH_LIBICU)
if (psl == &_builtin_psl)
need_conversion = 0;
#endif
if (need_conversion) { if (need_conversion) {
_psl_idna_t *idna = _psl_idna_open(); _psl_idna_t *idna = _psl_idna_open();

2
tests/test-is-public-all.c
View File

@ -49,7 +49,7 @@ static int
struct timespec ts1, ts2; struct timespec ts1, ts2;
#endif #endif
static inline int _isspace_ascii(const char c) static int _isspace_ascii(const char c)
{ {
return c == ' ' || c == '\t' || c == '\r' || c == '\n'; return c == ' ' || c == '\t' || c == '\r' || c == '\n';
} }