ofproto: Fix core dump due to uninitialized cls_rule.
authorEthan Jackson <ethan@nicira.com>
Tue, 10 Sep 2013 20:29:30 +0000 (13:29 -0700)
committerEthan Jackson <ethan@nicira.com>
Tue, 10 Sep 2013 20:43:35 +0000 (13:43 -0700)
Bug #19568.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
ofproto/ofproto.c

index e7ee60e..a9a20b8 100644 (file)
@@ -1290,7 +1290,6 @@ ofproto_run(struct ofproto *p)
             struct oftable *table = &p->tables[i];
             struct eviction_group *evg;
             struct cls_cursor cursor;
-            struct cls_rule cr;
             struct rule *rule;
 
             if (!table->eviction_fields) {
@@ -1302,7 +1301,7 @@ ofproto_run(struct ofproto *p)
             }
 
             ovs_rwlock_rdlock(&table->cls.rwlock);
-            cls_cursor_init(&cursor, &table->cls, &cr);
+            cls_cursor_init(&cursor, &table->cls, NULL);
             CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
                 if (!rule->eviction_group
                     && (rule->idle_timeout || rule->hard_timeout)) {