summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-10-24 07:18:39 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-10-24 07:18:39 +0000
commit8e12219e85a972c3b4fb0a864e6ab6e39999b9c3 (patch)
tree1939c5a0cc7c9fc24d72e33e8f53454a016c42b9
parent97631add11978014c70200995224667ce51954f7 (diff)
downloadpango-8e12219e85a972c3b4fb0a864e6ab6e39999b9c3.tar.gz
Fix another Oops of mine from recent commits.
2007-10-24 Behdad Esfahbod <behdad@gnome.org> * pango/glyphstring.c (pango_glyph_string_copy), (pango_glyph_string_free): Fix another Oops of mine from recent commits. svn path=/trunk/; revision=2466
-rw-r--r--ChangeLog6
-rw-r--r--pango/glyphstring.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4585ec5a..8d44dec0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-10-24 Behdad Esfahbod <behdad@gnome.org>
+ * pango/glyphstring.c (pango_glyph_string_copy),
+ (pango_glyph_string_free):
+ Fix another Oops of mine from recent commits.
+
+2007-10-24 Behdad Esfahbod <behdad@gnome.org>
+
Bug 472924 – Mark some classes abstract
* pango/fonts.c:
diff --git a/pango/glyphstring.c b/pango/glyphstring.c
index 6aeba2b7..307c9faf 100644
--- a/pango/glyphstring.c
+++ b/pango/glyphstring.c
@@ -105,7 +105,7 @@ pango_glyph_string_copy (PangoGlyphString *string)
{
PangoGlyphString *new_string;
- if (new_string == NULL)
+ if (string == NULL)
return NULL;
new_string = g_slice_new (PangoGlyphString);
@@ -131,6 +131,7 @@ pango_glyph_string_free (PangoGlyphString *string)
{
if (string == NULL)
return;
+
g_free (string->glyphs);
g_free (string->log_clusters);
g_slice_free (PangoGlyphString, string);