summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/cairo-font.c1
-rw-r--r--test/select-font-no-show-text.c6
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cabd48d4..a690d552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-14 Owen Taylor <otaylor@redhat.com>
+
+ * src/cairo-font.c (_cairo_simple_font_face_destroy): Remove
+ a stray free() (#3029, Carl Worth)
+
+ * test/select-font-no-show-text.c: Note that the bug is fixed.
+
2005-04-13 Carl Worth <cworth@cworth.org>
* src/cairo-image-surface.c:
diff --git a/src/cairo-font.c b/src/cairo-font.c
index 71eec2c9..36d21130 100644
--- a/src/cairo-font.c
+++ b/src/cairo-font.c
@@ -340,7 +340,6 @@ _cairo_simple_font_face_destroy (void *abstract_face)
_unlock_global_simple_cache ();
free (simple_face->family);
- free (simple_face);
}
static cairo_status_t
diff --git a/test/select-font-no-show-text.c b/test/select-font-no-show-text.c
index f662ce37..ee5f5639 100644
--- a/test/select-font-no-show-text.c
+++ b/test/select-font-no-show-text.c
@@ -32,6 +32,10 @@
*
* *** glibc detected *** double free or corruption (fasttop): 0x083274d0 ***
* Aborted
+ *
+ * 2005-04-14 Owen Taylor <otaylor@redhat.com>
+ *
+ * Fixed... just a stray free().
*/
#include <math.h>
@@ -39,7 +43,7 @@
static cairo_test_t test = {
"select-font-no-show-text",
- "Exercise a bug in calling cairo_select_font but never drawing text.",
+ "Test calling cairo_select_font but never drawing text.",
0, 0
};