]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fs/iso9660: Fix memory leaks in grub_iso9660_susp_iterate()
authort.feng <fengtao40@huawei.com>
Tue, 29 Nov 2022 09:14:13 +0000 (17:14 +0800)
committerDaniel Kiper <daniel.kiper@oracle.com>
Wed, 7 Dec 2022 22:38:26 +0000 (23:38 +0100)
Fixes: 99373ce47 (* grub-core/fs/iso9660.c: Remove nested functions)
Signed-off-by: t.feng <fengtao40@huawei.com>
Reviewed-by: Thomas Schmitt <scdbackup@gmx.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/fs/iso9660.c

index 91817ec1f5ad212f6af1cfd92e07ed17f8361d9f..df9f7783b42d4dc0faab2aac0f695b145bd0939c 100644 (file)
@@ -279,7 +279,10 @@ grub_iso9660_susp_iterate (grub_fshelp_node_t node, grub_off_t off,
   /* Load a part of the System Usage Area.  */
   err = read_node (node, off, sua_size, sua);
   if (err)
-    return err;
+    {
+      grub_free (sua);
+      return err;
+    }
 
   for (entry = (struct grub_iso9660_susp_entry *) sua; (char *) entry < (char *) sua + sua_size - 1 && entry->len > 0;
        entry = (struct grub_iso9660_susp_entry *)
@@ -309,7 +312,10 @@ grub_iso9660_susp_iterate (grub_fshelp_node_t node, grub_off_t off,
          err = grub_disk_read (node->data->disk, ce_block, off,
                                sua_size, sua);
          if (err)
-           return err;
+           {
+             grub_free (sua);
+             return err;
+           }
 
          entry = (struct grub_iso9660_susp_entry *) sua;
        }