diff options
| author |   Steven Luong <sluong@cisco.com> | 2019-06-11 22:44:20 -0700 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2019-06-18 13:48:04 +0000 |
| commit | 32a27b8f61cf7f8bf07b34911478814dcefe9d29 (patch) | |
| tree | c56196cdda11b556e6ec51eba3fe3090a66bd8d7 /src/vlib/error.c | |
| parent | b777d788d9dd578620abc99d00e41eae3d3239c2 (diff) | |
acl vnet vlib: memory leaks
Fix memory leaks in acl, vnet, and vlib components.
Type: fix
Change-Id: I61c84ebbacbbf3215db0d4aaa7699e8d5f8df2da
Signed-off-by: Steven Luong <sluong@cisco.com>
(cherry picked from commit 4221c8de596f3f3f66b4cbb36ad2d0c23486030c)
Diffstat (limited to 'src/vlib/error.c')
| -rw-r--r-- | src/vlib/error.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/vlib/error.c b/src/vlib/error.c index a416649cfa7..1a48c9e89c2 100644 --- a/src/vlib/error.c +++ b/src/vlib/error.c @@ -188,18 +188,19 @@ vlib_register_errors (vlib_main_t * vm, /* (re)register the em->counters base address, switch back to main heap */ vlib_stats_pop_heap2 (em->counters, vm->thread_index, oldheap); - { - elog_event_type_t t; - uword i; + if (VLIB_ELOG_MAIN_LOOP > 0) + { + elog_event_type_t t; + uword i; - clib_memset (&t, 0, sizeof (t)); - for (i = 0; i < n_errors; i++) - { - t.format = (char *) format (0, "%v %s: %%d", - n->name, error_strings[i]); - vm->error_elog_event_types[n->error_heap_index + i] = t; - } - } + clib_memset (&t, 0, sizeof (t)); + for (i = 0; i < n_errors; i++) + { + t.format = (char *) format (0, "%v %s: %%d", + n->name, error_strings[i]); + vm->error_elog_event_types[n->error_heap_index + i] = t; + } + } } static clib_error_t * |