[ovs-dev] [PATCH] ipfix: fix segfault for Flow_Sample_Collector_Set without ipfix

[Romain Lenglet]

Signed-off-by: Romain Lenglet <rleng...@vmware.com>
---
 vswitchd/bridge.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index fecae60..8f45870 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -995,7 +995,7 @@ bridge_configure_ipfix(struct bridge *br)
     size_t n_fe_opts = 0;
 
     OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
-        if (fe_cfg->bridge == br->cfg) {
+        if (fe_cfg->ipfix && fe_cfg->bridge == br->cfg) {
             n_fe_opts++;
         }
     }
@@ -1035,7 +1035,7 @@ bridge_configure_ipfix(struct bridge *br)
         fe_opts = xcalloc(n_fe_opts, sizeof *fe_opts);
         opts = fe_opts;
         OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
-            if (fe_cfg->bridge == br->cfg) {
+            if (fe_cfg->ipfix && fe_cfg->bridge == br->cfg) {
                 opts->collector_set_id = fe_cfg->id;
                 sset_init(&opts->targets);
                 sset_add_array(&opts->targets, fe_cfg->ipfix->targets,
-- 
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev