2 files changed, 6 insertions, 2 deletions

diff --git a/src/bin/eolian/eo1_generator.c b/src/bin/eolian/eo1_generator.c
index 1542f08ab5..478ddd9289 100644
--- a/src/bin/eolian/eo1_generator.c
+++ b/src/bin/eolian/eo1_generator.c
@@ -294,11 +294,13 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf)
    eina_strbuf_replace_all(str_hdr, "@#list_subid", eina_strbuf_string_get(str_subid));
    eina_strbuf_append(str_hdr, eina_strbuf_string_get(str_ev));
 
+   eina_strbuf_append(buf, eina_strbuf_string_get(str_hdr));
+
    eina_strbuf_free(str_subid);
    eina_strbuf_free(str_ev);
    eina_strbuf_free(tmpbuf);
+   eina_strbuf_free(str_hdr);
 
-   eina_strbuf_append(buf, eina_strbuf_string_get(str_hdr));
    return EINA_TRUE;
 }
 
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 4a294e4281..8b36f13765 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -27,7 +27,9 @@ _include_guard_enclose(const char *fname, const char *fbody)
          incname);
    eina_strbuf_replace_all(incguard, ".", "_");
    eina_strbuf_replace_all(incguard, "_code_", fbody);
-   return eina_strbuf_string_steal(incguard);
+   char *ret = eina_strbuf_string_steal(incguard);
+   eina_strbuf_free(incguard);
+   return ret;
 }
 
 static const char *