Merge "master" into "next".

[cascardo/ovs.git] / lib / dhcp.c

diff --git a/lib/dhcp.c b/lib/dhcp.c
index a8f0244..e16176b 100644 (file)
--- a/lib/dhcp.c
+++ b/lib/dhcp.c
@@ -497,7 +497,7 @@ dhcp_option_equals(const struct dhcp_option *a, const struct dhcp_option *b)
 {
     return ((a->data != NULL) == (b->data != NULL)
             && a->n == b->n
-            && !memcmp(a->data, b->data, a->n));
+            && (!a->data || !memcmp(a->data, b->data, a->n)));
 }
 
 /* Replaces 'ds' by a string representation of 'msg'.  If 'multiline' is