quagga: fix segment fault when stopping ospf6d

In ospf6_clean, the variable ospf6 might be NULL causing segment fault
when stopping ospf6d. Check the variable before referencing it.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Qi.Chen@windriver.com 2015-11-23 12:34:12 +08:00 committed by Joe MacDonald
parent 8d1ce255bc
commit 8310289187
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,28 @@
Upstream-Status: Pending
Subject: ospf6d: check ospf6 before using it in ospf6_clean
The ospf6 variable might be 'NULL' causing segment fault error.
Check it before referencing it.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
ospf6d/ospf6d.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 3cdd5c1..e3bf1af 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -1892,6 +1892,8 @@ ospf6_init (void)
void
ospf6_clean (void)
{
+ if (ospf6 == NULL)
+ return;
if (ospf6->route_table)
ospf6_route_remove_all (ospf6->route_table);
if (ospf6->brouter_table)
--
1.9.1

View File

@ -1,6 +1,7 @@
require quagga.inc
SRC_URI += "file://babel-close-the-stdout-stderr-as-in-other-daemons.patch \
file://0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch \
"
SRC_URI[md5sum] = "7986bdc2fe6027d4c9216f7f5791e718"