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

Merge pull request #7632 from idryzhov/vtysh-memory-fixes

Browse Source 
vtysh memory fixes
This commit is contained in:
Donald Sharp 2020-12-01 12:08:52 -05:00 committed by GitHub
commit 5c1a899432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/developer/memtypes.rst
View File

@ -131,3 +131,10 @@ Usage
- if ptr is NULL, no operation is performed (as is guaranteed by system
implementations.) Do not surround XFREE with ``if (ptr != NULL)``
checks.
.. c:function:: void XCOUNTFREE(struct memtype *mtype, void *ptr)
This macro is used to count the ``ptr`` as freed without actually freeing
it. This may be needed in some very specific cases, for example, when the
``ptr`` was allocated using any of the above wrappers and will be freed
by some external library using simple ``free()``.

6
lib/memory.c
View File

@ -127,6 +127,12 @@ void *qstrdup(struct memtype *mt, const char *str)
return str ? mt_checkalloc(mt, strdup(str), strlen(str) + 1) : NULL;
}
void qcountfree(struct memtype *mt, void *ptr)
{
if (ptr)
mt_count_free(mt, ptr);
}
void qfree(struct memtype *mt, void *ptr)
{
if (ptr)

3
lib/memory.h
View File

@ -162,12 +162,15 @@ extern void *qrealloc(struct memtype *mt, void *ptr, size_t size)
__attribute__((_ALLOC_SIZE(3), nonnull(1) _RET_NONNULL));
extern void *qstrdup(struct memtype *mt, const char *str)
__attribute__((malloc, nonnull(1) _RET_NONNULL));
extern void qcountfree(struct memtype *mt, void *ptr)
__attribute__((nonnull(1)));
extern void qfree(struct memtype *mt, void *ptr) __attribute__((nonnull(1)));
#define XMALLOC(mtype, size) qmalloc(mtype, size)
#define XCALLOC(mtype, size) qcalloc(mtype, size)
#define XREALLOC(mtype, ptr, size) qrealloc(mtype, ptr, size)
#define XSTRDUP(mtype, str) qstrdup(mtype, str)
#define XCOUNTFREE(mtype, ptr) qcountfree(mtype, ptr)
#define XFREE(mtype, ptr) \
do { \
qfree(mtype, ptr); \

8
vtysh/vtysh.c
View File

@ -1144,12 +1144,10 @@ static char *command_generator(const char *text, int state)
cmd_free_strvec(vline);
}
if (matched && matched[index])
/*
* this is free()'d by readline, but we leak 1 count of
* MTYPE_COMPLETION
*/
if (matched && matched[index]) {
XCOUNTFREE(MTYPE_COMPLETION, matched[index]);
return matched[index++];
}
XFREE(MTYPE_TMP, matched);

4
vtysh/vtysh_config.c
View File

@ -485,8 +485,10 @@ void vtysh_config_dump(void)
* are not under the VRF node.
*/
if (config->index == INTERFACE_NODE
&& list_isempty(config->line))
&& list_isempty(config->line)) {
config_del(config);
continue;
}
vty_out(vty, "%s\n", config->name);