proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 01:47:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7925 from opensourcerouting/watchfrr-netns

Browse Source 
watchfrr: fix crash on missing optional argument
This commit is contained in:
Donald Sharp 2021-01-26 15:31:04 -05:00 committed by GitHub
commit b2fd215b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
watchfrr/watchfrr.c
View File

@ -1080,6 +1080,9 @@ static int valid_command(const char *cmd)
{ {
char *p; char *p;
if (cmd == NULL)
return 0;
return ((p = strchr(cmd, '%')) != NULL) && (*(p + 1) == 's') return ((p = strchr(cmd, '%')) != NULL) && (*(p + 1) == 's')
&& !strchr(p + 1, '%'); && !strchr(p + 1, '%');
} }
@ -1414,7 +1417,7 @@ int main(int argc, char **argv)
} break; } break;
case OPTION_NETNS: case OPTION_NETNS:
netns_en = true; netns_en = true;
if (strchr(optarg, '/')) { if (optarg && strchr(optarg, '/')) {
fprintf(stderr, fprintf(stderr,
"invalid network namespace name \"%s\" (may not contain slashes)\n", "invalid network namespace name \"%s\" (may not contain slashes)\n",
optarg); optarg);