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

lib: Fix memory leak in ipv6_prefix_match

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-09-13 21:22:34 +00:00
parent 795d02785a
commit 040f39843e
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/command_match.c
View File

@ -720,7 +720,7 @@ match_ipv6_prefix (const char *str)
{ {
struct sockaddr_in6 sin6_dummy; struct sockaddr_in6 sin6_dummy;
const char *delim = "/\0"; const char *delim = "/\0";
char *dupe, *prefix, *mask, *context, *endptr; char *tofree, *dupe, *prefix, *mask, *endptr;
int nmask = -1; int nmask = -1;
if (str == NULL) if (str == NULL)
@ -729,26 +729,33 @@ match_ipv6_prefix (const char *str)
if (strspn (str, IPV6_PREFIX_STR) != strlen (str)) if (strspn (str, IPV6_PREFIX_STR) != strlen (str))
return no_match; return no_match;
/* tokenize to address + mask */ /* tokenize to prefix + mask */
dupe = XCALLOC(MTYPE_TMP, strlen(str)+1); tofree = dupe = XSTRDUP (MTYPE_TMP, str);
strncpy(dupe, str, strlen(str)+1); prefix = strsep (&dupe, delim);
prefix = strtok_r(dupe, delim, &context); mask = dupe;
mask = strtok_r(NULL, delim, &context);
if (!mask)
return partly_match;
/* validate prefix */ /* validate prefix */
if (inet_pton(AF_INET6, prefix, &sin6_dummy.sin6_addr) != 1) if (inet_pton (AF_INET6, prefix, &sin6_dummy.sin6_addr) != 1)
{
XFREE (MTYPE_TMP, tofree);
return no_match; return no_match;
}
/* validate mask */ /* validate mask */
if (!mask)
{
XFREE (MTYPE_TMP, tofree);
return partly_match;
}
nmask = strtoimax (mask, &endptr, 10); nmask = strtoimax (mask, &endptr, 10);
if (*endptr != '\0' || nmask < 0 || nmask > 128) if (*endptr != '\0' || nmask < 0 || nmask > 128)
{
XFREE (MTYPE_TMP, tofree);
return no_match; return no_match;
}
XFREE(MTYPE_TMP, dupe); XFREE (MTYPE_TMP, tofree);
return exact_match; return exact_match;
} }
#endif #endif

1
lib/grammar_sandbox.c
View File

@ -356,7 +356,6 @@ new_cmd_token (enum cmd_token_type_t type, char *text, char *desc)
void void
del_cmd_token (struct cmd_token_t *token) del_cmd_token (struct cmd_token_t *token)
{ {
fprintf (stdout, "deleting token\n");
if (!token) return; if (!token) return;
if (token->text) if (token->text)