0023-emu-Make-grub_free-NULL-safe.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 320e86747a32e4d46d24ee4b64493741c161da50 Mon Sep 17 00:00:00 2001
  2. From: Peter Jones <pjones@redhat.com>
  3. Date: Sun, 19 Jul 2020 16:08:08 -0400
  4. Subject: [PATCH] emu: Make grub_free(NULL) safe
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. The grub_free() implementation in grub-core/kern/mm.c safely handles
  9. NULL pointers, and code at many places depends on this. We don't know
  10. that the same is true on all host OSes, so we need to handle the same
  11. behavior in grub-emu's implementation.
  12. Signed-off-by: Peter Jones <pjones@redhat.com>
  13. Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
  14. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  15. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  16. ---
  17. grub-core/kern/emu/mm.c | 3 ++-
  18. 1 file changed, 2 insertions(+), 1 deletion(-)
  19. diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
  20. index 145b01d37..4d1046a21 100644
  21. --- a/grub-core/kern/emu/mm.c
  22. +++ b/grub-core/kern/emu/mm.c
  23. @@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size)
  24. void
  25. grub_free (void *ptr)
  26. {
  27. - free (ptr);
  28. + if (ptr)
  29. + free (ptr);
  30. }
  31. void *
  32. --
  33. 2.26.2