usb-mtp: prevent null dereference while deleting objects

Spotted by Coverity: CID 1399144

Signed-off-by: Bandan Das <[email protected]>
Message-id: 20190306210409[email protected]
Signed-off-by: Gerd Hoffmann <[email protected]>

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 1f22284949df1bc4ccd904ab1db76426c54386bc..06e376bcd211474cd2b13fc9583b8479db294d57 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -1177,9 +1177,7 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans)
             usb_mtp_object_free_one(s, o);
             success = true;
         }
-    }
-
-    if (o->format == FMT_ASSOCIATION) {
+    } else if (o->format == FMT_ASSOCIATION) {
         if (rmdir(o->path)) {
             partial_delete = true;
         } else {