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

fix return value of psl_builtin() to NULL if no builtin PSL data available

This commit is contained in:
Tim Ruehsen 2014-05-30 16:08:47 +02:00
parent e9be57241d
commit 0eeec32ee3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/psl.c
View File

@ -557,7 +557,11 @@ void psl_free(psl_ctx_t *psl)
*/ */
const psl_ctx_t *psl_builtin(void) const psl_ctx_t *psl_builtin(void)
{ {
#ifdef WITH_BUILTIN
return &_builtin_psl; return &_builtin_psl;
#else
return NULL;
#endif
} }
/** /**

10
tools/psl.c
View File

@ -90,7 +90,8 @@ int main(int argc, const char *const *argv)
fprintf(stderr, "Dropped data from %s\n", psl_file); fprintf(stderr, "Dropped data from %s\n", psl_file);
psl_file = NULL; psl_file = NULL;
} }
psl = (psl_ctx_t *) psl_builtin(); if (!(psl = (psl_ctx_t *) psl_builtin()))
printf("No builtin PSL data available\n");
} }
else if (!strcmp(*arg, "--load-psl-file") && arg < argv + argc - 1) { else if (!strcmp(*arg, "--load-psl-file") && arg < argv + argc - 1) {
psl_free(psl); psl_free(psl);
@ -118,6 +119,11 @@ int main(int argc, const char *const *argv)
break; break;
} }
if (!psl && mode != 99) {
printf("No PSL data available - aborting\n");
exit(2);
}
if (mode == 1) { if (mode == 1) {
for (; arg < argv + argc; arg++) for (; arg < argv + argc; arg++)
printf("%s: %d\n", *arg, psl_is_public_suffix(psl, *arg)); printf("%s: %d\n", *arg, psl_is_public_suffix(psl, *arg));
@ -135,7 +141,7 @@ int main(int argc, const char *const *argv)
printf("%s: %d\n", *arg, psl_is_cookie_domain_acceptable(psl, *arg, cookie_domain)); printf("%s: %d\n", *arg, psl_is_cookie_domain_acceptable(psl, *arg, cookie_domain));
} }
else if (mode == 99) { else if (mode == 99) {
if (psl != psl_builtin()) { if (psl && psl != psl_builtin()) {
printf("suffixes: %d\n", psl_suffix_count(psl)); printf("suffixes: %d\n", psl_suffix_count(psl));
printf("exceptions: %d\n", psl_suffix_exception_count(psl)); printf("exceptions: %d\n", psl_suffix_exception_count(psl));
} }