2 files changed, 27 insertions, 5 deletions
diff --git a/src/libelfu/model/phdr.c b/src/libelfu/model/phdr.c
index d26eb77..ce395ec 100644
--- a/src/libelfu/model/phdr.c
+++ b/src/libelfu/model/phdr.c
@@ -1,4 +1,6 @@
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <libelfu/libelfu.h>
 
 
@@ -34,3 +36,27 @@ void elfu_mPhdrUpdateChildOffsets(ElfuPhdr *mp)
     ms->shdr.sh_offset = mp->phdr.p_offset + (ms->shdr.sh_addr - mp->phdr.p_vaddr);
   }
 }
+
+
+
+/*
+ * Allocation, destruction
+ */
+
+ElfuPhdr* elfu_mPhdrAlloc()
+{
+  ElfuPhdr *mp;
+
+  mp = malloc(sizeof(ElfuPhdr));
+  if (!mp) {
+    ELFU_WARN("mPhdrAlloc: malloc() failed for ElfuPhdr.\n");
+    return NULL;
+  }
+
+  memset(mp, 0, sizeof(*mp));
+
+  CIRCLEQ_INIT(&mp->childScnList);
+  CIRCLEQ_INIT(&mp->childPhdrList);
+
+  return mp;
+}
diff --git a/src/libelfu/modelops/fromFile.c b/src/libelfu/modelops/fromFile.c
index 9c25e29..8e1bb81 100644
--- a/src/libelfu/modelops/fromFile.c
+++ b/src/libelfu/modelops/fromFile.c
@@ -185,17 +185,13 @@ static ElfuPhdr* modelFromPhdr(GElf_Phdr *phdr)
 
   assert(phdr);
 
-  mp = malloc(sizeof(ElfuPhdr));
+  mp = elfu_mPhdrAlloc();
   if (!mp) {
-    ELFU_WARN("modelFromPhdr: malloc() failed for ElfuPhdr.\n");
     return NULL;
   }
 
   mp->phdr = *phdr;
 
-  CIRCLEQ_INIT(&mp->childScnList);
-  CIRCLEQ_INIT(&mp->childPhdrList);
-
   return mp;
 }