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

psl tool: Fix possible crashes with printf %s, NULL 

Reported-by: Mike Schiffman
This commit is contained in:
Tim Rühsen 2018-07-04 09:37:14 +02:00
parent 4c68696eb1
commit 523397fb83
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/psl.c
View File

@ -198,10 +198,14 @@ int main(int argc, const char *const *argv)
else else
putchar('\n'); putchar('\n');
} }
else if (mode == 2) else if (mode == 2) {
printf("%s\n", psl_unregistrable_domain(psl, lower)); const char *dom = psl_unregistrable_domain(psl, lower);
else if (mode == 3) printf("%s\n", dom ? dom : "(null)");
printf("%s\n", psl_registrable_domain(psl, lower)); }
else if (mode == 3) {
const char *dom = psl_registrable_domain(psl, lower);
printf("%s\n", dom ? dom : "(null)");
}
else if (mode == 4) { else if (mode == 4) {
char *cookie_domain_lower; char *cookie_domain_lower;
@ -234,16 +238,18 @@ int main(int argc, const char *const *argv)
} }
else if (mode == 2) { else if (mode == 2) {
for (; arg < argv + argc; arg++) { for (; arg < argv + argc; arg++) {
const char *dom = psl_unregistrable_domain(psl, *arg);
if (!batch_mode) if (!batch_mode)
printf("%s: ", *arg); printf("%s: ", *arg);
printf("%s\n", psl_unregistrable_domain(psl, *arg)); printf("%s\n", dom ? dom : "(null)");
} }
} }
else if (mode == 3) { else if (mode == 3) {
for (; arg < argv + argc; arg++) { for (; arg < argv + argc; arg++) {
const char *dom = psl_registrable_domain(psl, *arg);
if (!batch_mode) if (!batch_mode)
printf("%s: ", *arg); printf("%s: ", *arg);
printf("%s\n", psl_registrable_domain(psl, *arg)); printf("%s\n", dom ? dom : "(null)");
} }
} }
else if (mode == 4) { else if (mode == 4) {