]> www.infradead.org Git - users/dwmw2/qemu.git/commit
blockdev: Plug memory leak in drive_init()
authorMarkus Armbruster <armbru@redhat.com>
Wed, 28 May 2014 09:17:02 +0000 (11:17 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 3 Jul 2014 21:31:29 +0000 (16:31 -0500)
commitd1775fe94a1bbfb337c7e6d178a81de3c5339d3f
tree6ffa4bb84eca0c4a98d1573c2b2e7cb21f519a16
parentd2b987479a322f246753ce82a5b6f535e15626f4
blockdev: Plug memory leak in drive_init()

bs_opts is leaked on all paths from its qdev_new() that don't got
through blockdev_init().  Add the missing QDECREF(), and zap bs_opts
after blockdev_init(), so the new QDECREF() does nothing when we go
through blockdev_init().

Leak introduced in commit f298d07.  Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 3cb0e25c4b417b7336816bd92de458f0770d49ff)

Conflicts:
blockdev.c

*fixed trivial context mismatch due to blockdev_init signature change

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
blockdev.c