diff --git a/ChangeLog b/ChangeLog
index 4aec46d..e89cdc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-24  Mike Fabian  <mfabian@suse.de>
+	    Takashi Iwai  <tiwai@suse.de>
+	reviewed by: plam
+	
+	* src/fcfreetype.c (GetScriptTags):
+
+	Fix double-free on error case.
+
 2006-02-21  Patrick Lam  <plam@mit.edu>
 	* fc-lang/fc-lang.c (scan):
 
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index e3c5ef2..5a5ab6d 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2823,6 +2823,7 @@ GetScriptTags(FT_Face face, FT_ULong tabletag, FT_ULong **stags, FT_UShort *scri
 Fail:
     *script_count = 0;
     ftglue_free( memory, *stags );
+    *stags = NULL;
     return error;
 }