summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBandan Das <bsd@redhat.com>2019-03-06 16:04:09 -0500
committerGerd Hoffmann <kraxel@redhat.com>2019-03-07 10:02:48 +0100
commit7ddf837465e6110fb46b85cfd169ad50d71aa152 (patch)
tree242a3eda2108333a4b34754bb25f88ac0989f4e0
parent298ac63c4428e05b09f9d0959f89fd5436c4a0ec (diff)
downloadfocaccia-qemu-7ddf837465e6110fb46b85cfd169ad50d71aa152.tar.gz
focaccia-qemu-7ddf837465e6110fb46b85cfd169ad50d71aa152.zip
usb-mtp: prevent null dereference while deleting objects
Spotted by Coverity: CID 1399144

Signed-off-by: Bandan Das <bsd@redhat.com>
Message-id: 20190306210409.14842-4-bsd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/usb/dev-mtp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 1f22284949..06e376bcd2 100644
--- 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 {