]> git.ipfire.org Git - thirdparty/grub.git/commit
commands/probe: Fix resource leaks
authorAlec Brown <alec.r.brown@oracle.com>
Wed, 10 Nov 2021 20:49:28 +0000 (15:49 -0500)
committerDaniel Kiper <daniel.kiper@oracle.com>
Mon, 22 Nov 2021 15:03:15 +0000 (16:03 +0100)
commit07d7bdb786e66bbe2d441225620f5865cf8d5fc6
tree660e2af642a8728165711f855de0c8cca893654a
parent5983c2c6adf1c1bbb3ecd751253d1e898bdfd8a3
commands/probe: Fix resource leaks

Commit 1fc860bb76bb (commands/probe: Fix a resource leak when probing disks),
missed other cases where grub_device_close() should be called before a return
statement is called. Also found that grub_disk_close() wasn't being called when
an error is being returned. To avoid conflict with grub_errno, grub_error_push()
should be called before either grub_device_close() or grub_disk_close() is
called and grub_error_pop() should be called before grub_errno is returned.

Fixes: 1fc860bb76bb (commands/probe: Fix a resource leak when probing disks)
Fixes: CID 292443
Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/commands/probe.c