From: Ben Pfaff <blp@nicira.com>
Date: Thu, 15 Mar 2012 21:06:54 +0000 (-0700)
Subject: meta-flow: Don't dereference NULL sf->field in mf_format_subfield().
X-Git-Tag: sliver-openvswitch-0.1-1~188
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33500edd53fd76a304766812fd0829e7f3ab222f;p=sliver-openvswitch.git

meta-flow: Don't dereference NULL sf->field in mf_format_subfield().

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index c12a90977..11d27b159 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -2343,7 +2343,7 @@ mf_format_subfield(const struct mf_subfield *sf, struct ds *s)
         ds_put_cstr(s, sf->field->name);
     }
 
-    if (sf->ofs == 0 && sf->n_bits == sf->field->n_bits) {
+    if (sf->field && sf->ofs == 0 && sf->n_bits == sf->field->n_bits) {
         ds_put_cstr(s, "[]");
     } else if (sf->n_bits == 1) {
         ds_put_format(s, "[%d]", sf->ofs);