OSPF: variable-length array of size 0 replaced by alloca()'d pointer
NULL pointer is safer than a random pointer onto stack if this function gets changed and eventually broken.
This commit is contained in:
parent
baac700906
commit
dccee40826
1 changed files with 4 additions and 2 deletions
|
@ -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,6 +1289,8 @@ 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);
|
||||||
|
|
||||||
|
if (verbose)
|
||||||
qsort(hex, jx, sizeof(struct top_hash_entry *), ext_compare_for_state);
|
qsort(hex, jx, sizeof(struct top_hash_entry *), ext_compare_for_state);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue