Commit 56802fde authored by claes's avatar claes

Assert for null objid in MountObject avoided

parent 70750f9b
......@@ -403,7 +403,8 @@ gdb_AddMountServer (
gdb_AssumeLocked;
pwr_Assert(cdh_ObjidIsNotNull(soid));
// pwr_Assert(cdh_ObjidIsNotNull(soid));
if (cdh_ObjidIsNull(soid)) return NULL;
msp = hash_Search(sts, gdbroot->ms_ht, &soid);
if (msp != NULL) {
......
......@@ -230,7 +230,8 @@ mountClients (
if (op->g.flags.b.isMountClient && op->g.oid.vid == gdbroot->db->vid) {
/* Only root volumes can mount. */
mountVolume(sts, op);
pwr_Assert(ODD(*sts));
if ( *sts != GDH__NOMOUNTOBJECT)
pwr_Assert(ODD(*sts));
}
}
return YES;
......@@ -263,6 +264,10 @@ mountVolume (
switch (op->g.cid) {
case pwr_eClass_MountObject:
soid = ((pwr_sMountObject *)p)->Object;
if ( cdh_ObjidIsNull(soid)) {
*sts = GDH__NOMOUNTOBJECT;
return NULL;
}
vp = vol_MountVolume(sts, soid.vid);
break;
case pwr_eClass_MountVolume:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment