Commit b10e45a7fb34f78f79ffb17c9db282e8ce7a4918
2006-06-08T07:32:56
* src/bdf/bdflib.c (bdf_load_font): Fix memory leaks in case of errors.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/ChangeLog b/ChangeLog
index 76c5a67..0395297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08 Werner Lemberg <wl@gnu.org>
+
+ * src/bdf/bdflib.c (bdf_load_font): Fix memory leaks in case of
+ errors.
+
2006-06-07 David Turner <david@freetype.org>
* src/type1/t1afm.c (KERN_INDEX): Make it more robust.
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 3c928e5..6b75035 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -2224,7 +2224,7 @@
error = _bdf_readstream( stream, _bdf_parse_start,
(void *)p, &lineno );
if ( error )
- goto Exit;
+ goto Fail;
if ( p->font != 0 )
{
@@ -2316,7 +2316,7 @@
if ( FT_RENEW_ARRAY( p->font->comments,
p->font->comments_len,
p->font->comments_len + 1 ) )
- goto Exit;
+ goto Fail;
p->font->comments[p->font->comments_len] = 0;
}
@@ -2337,6 +2337,15 @@
}
return error;
+
+ Fail:
+ bdf_free_font( p->font );
+
+ memory = extmemory;
+
+ FT_FREE( p->font );
+
+ goto Exit;
}