]> git.proxmox.com Git - grub2.git/commitdiff
emu: Make grub_free(NULL) safe
authorPeter Jones <pjones@redhat.com>
Sun, 19 Jul 2020 20:08:08 +0000 (16:08 -0400)
committerDaniel Kiper <daniel.kiper@oracle.com>
Wed, 29 Jul 2020 14:55:48 +0000 (16:55 +0200)
The grub_free() implementation in grub-core/kern/mm.c safely handles
NULL pointers, and code at many places depends on this. We don't know
that the same is true on all host OSes, so we need to handle the same
behavior in grub-emu's implementation.

Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/kern/emu/mm.c

index 145b01d3719574a95275cfa924732d67c8b37cae..4d1046a219ebf7273ec9f6140a8829f618eabb7c 100644 (file)
@@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size)
 void
 grub_free (void *ptr)
 {
-  free (ptr);
+  if (ptr)
+    free (ptr);
 }
 
 void *