Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OSPF: variable-length array of size 0 replaced by alloca()'d pointer

Browse source 
NULL pointer is safer than a random pointer onto stack if this function
gets changed and eventually broken.
This commit is contained in:
Maria Matejka 2019-08-16 12:47:13 +02:00
parent baac700906
commit dccee40826
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proto/ospf/ospf.c
View file

@ -1244,7 +1244,7 @@ ospf_sh_state(struct proto *P, int verbose, int reachable)
uint num = p->gr->hash_entries; uint num = p->gr->hash_entries;
struct top_hash_entry *hea[num]; struct top_hash_entry *hea[num];
struct top_hash_entry *hex[verbose ? num : 0]; struct top_hash_entry **hex = verbose ? alloca(num * sizeof(struct top_hash_entry *)) : NULL;
struct top_hash_entry *he; struct top_hash_entry *he;
struct top_hash_entry *cnode = NULL; struct top_hash_entry *cnode = NULL;
@ -1289,7 +1289,9 @@ ospf_sh_state(struct proto *P, int verbose, int reachable)
lsa_compare_ospf3 = !ospf2; lsa_compare_ospf3 = !ospf2;
qsort(hea, j1, sizeof(struct top_hash_entry *), lsa_compare_for_state); qsort(hea, j1, sizeof(struct top_hash_entry *), lsa_compare_for_state);
qsort(hex, jx, sizeof(struct top_hash_entry *), ext_compare_for_state);
if (verbose)
qsort(hex, jx, sizeof(struct top_hash_entry *), ext_compare_for_state);
/* /*
* This code is a bit tricky, we have a primary LSAs (router and * This code is a bit tricky, we have a primary LSAs (router and