[coreboot-gerrit] New patch to review for coreboot: cbfstool/elfheaders: Make elf_writer_destroy NULL-safe

Furquan Shaikh (furquan@google.com) gerrit at coreboot.org
Fri Aug 5 21:11:15 CEST 2016


Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16076

-gerrit

commit 492d2f559eb422992dd70c49bb4ddd4aa0bbfb53
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri Aug 5 12:04:55 2016 -0700

    cbfstool/elfheaders: Make elf_writer_destroy NULL-safe
    
    This relieves caller from having to check if the parameter being passed
    in is NULL.
    
    Change-Id: I3ea935c12d46c6fb5534e0f2077232b9e25240f1
    Signed-off-by: Furquan Shaikh <furquan at google.com>
---
 util/cbfstool/elfheaders.c | 4 ++++
 util/cbfstool/elfparsing.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 8942eea..0462d0a 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -808,10 +808,14 @@ struct elf_writer *elf_writer_init(const Elf64_Ehdr *ehdr)
 /*
  * Clean up any internal state represented by ew. Aftewards the elf_writer
  * is invalid.
+ * It is safe to call elf_writer_destroy with ew as NULL. It returns without
+ * performing any action.
  */
 void elf_writer_destroy(struct elf_writer *ew)
 {
 	int i;
+	if (ew == NULL)
+		return;
 	if (ew->phdrs != NULL)
 		free(ew->phdrs);
 	free(ew->strtab.buffer);
diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h
index 4b9ba8d..978592b 100644
--- a/util/cbfstool/elfparsing.h
+++ b/util/cbfstool/elfparsing.h
@@ -93,6 +93,8 @@ struct elf_writer *elf_writer_init(const Elf64_Ehdr *ehdr);
 /*
  * Clean up any internal state represented by ew. Aftewards the elf_writer
  * is invalid.
+ * It is safe to call elf_writer_destroy with ew as NULL. It returns without
+ * performing any action.
  */
 void elf_writer_destroy(struct elf_writer *ew);
 



More information about the coreboot-gerrit mailing list