Fix null pointer derefence in non-debug builds

xenbus_get_self_id() calls xenbus_read within BUG_ON, but BUG_ON(x) resolves to nothing in non-debug builds, removing the call. This made sscanf dereference a null value.
sysml · Apr 21, 2016 · 868d075 · 868d075
1 parent 7b21e31
commit 868d075
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c
@@ -833,7 +833,9 @@ domid_t xenbus_get_self_id(void)
     char *dom_id;
     domid_t ret;
 
-    BUG_ON(xenbus_read(XBT_NIL, "domid", &dom_id));
+    if (xenbus_read(XBT_NIL, "domid", &dom_id)) {
+	    BUG_ON(1);
+    }
     sscanf(dom_id, "%"SCNd16, &ret);
 
     return ret;