matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

isisd: in isis_mt.c use appropriate memory allocator

Browse source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-08-30 08:52:06 -04:00
parent 3bf359b04e
commit a556f6e38b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
isisd/isis_mt.c
View file

@ -226,7 +226,8 @@ struct isis_area_mt_setting **area_mt_settings(struct isis_area *area,
count++; count++;
if (count > size) { if (count > size) {
rv = XREALLOC(MTYPE_TMP, rv, count * sizeof(*rv)); rv = XREALLOC(MTYPE_MT_AREA_SETTING, rv,
count * sizeof(*rv));
size = count; size = count;
} }
rv[count - 1] = setting; rv[count - 1] = setting;
@ -341,7 +342,8 @@ circuit_mt_settings(struct isis_circuit *circuit, unsigned int *mt_count)
count++; count++;
if (count > size) { if (count > size) {
rv = XREALLOC(MTYPE_TMP, rv, count * sizeof(*rv)); rv = XREALLOC(MTYPE_MT_AREA_SETTING, rv,
count * sizeof(*rv));
size = count; size = count;
} }
rv[count - 1] = setting; rv[count - 1] = setting;
@ -376,8 +378,8 @@ bool tlvs_to_adj_mt_set(struct isis_tlvs *tlvs, bool v4_usable, bool v6_usable,
old_mt_count = adj->mt_count; old_mt_count = adj->mt_count;
if (old_mt_count) { if (old_mt_count) {
old_mt_set = old_mt_set = XCALLOC(MTYPE_MT_AREA_SETTING,
XCALLOC(MTYPE_TMP, old_mt_count * sizeof(*old_mt_set)); old_mt_count * sizeof(*old_mt_set));
memcpy(old_mt_set, adj->mt_set, memcpy(old_mt_set, adj->mt_set,
old_mt_count * sizeof(*old_mt_set)); old_mt_count * sizeof(*old_mt_set));
} }
@ -436,7 +438,7 @@ bool tlvs_to_adj_mt_set(struct isis_tlvs *tlvs, bool v4_usable, bool v6_usable,
changed = true; changed = true;
if (old_mt_count) if (old_mt_count)
XFREE(MTYPE_TMP, old_mt_set); XFREE(MTYPE_MT_AREA_SETTING, old_mt_set);
return changed; return changed;
} }
@ -464,7 +466,7 @@ static void mt_set_add(uint16_t **mt_set, unsigned int *size,
} }
if (*index >= *size) { if (*index >= *size) {
*mt_set = XREALLOC(MTYPE_TMP, *mt_set, *mt_set = XREALLOC(MTYPE_MT_AREA_SETTING, *mt_set,
sizeof(**mt_set) * ((*index) + 1)); sizeof(**mt_set) * ((*index) + 1));
*size = (*index) + 1; *size = (*index) + 1;
} }