From: Patrick Lam <plam@MIT.EDU>
Date: Thu, 3 Nov 2005 04:23:22 +0000 (+0000)
Subject: Fix warnings and embarrassing double-free error.
X-Git-Tag: fc-2_3_92~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7358dae49b328f5546d156246510601e2dd85d1c;hp=efa9f2bd077da0ccc432b80baf87c2a3e7340f6a;p=fontconfig.git

Fix warnings and embarrassing double-free error.
---

diff --git a/ChangeLog b/ChangeLog
index 6223c13..d4e3a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-02  Patrick Lam  <plam@mit.edu>
+	* src/fcfreetype.c (FcFreetypeQuery):
+	* src/fcpat.c (FcPatternDestroy, FcPatternDuplicate, 
+	               FcPatternTransferFullFname):
+
+	Fix warnings and embarrassing double-free error.
+
 2005-11-02  Zhe Su  <zsu@novell.com>
 	reviewed by: plam
 	
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 9872836..46dc5a4 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1291,7 +1291,7 @@ FcFreeTypeQuery (const FcChar8	*file,
     if (!FcPatternAddString (pat, FC_FILE, (FcChar8 *)basename((char *)FcStrCopy(file))))
 	goto bail1;
 
-    FcPatternAddFullFname (pat, (const char *)file);
+    FcPatternAddFullFname (pat, (const char *)FcStrCopy (file));
 
     if (!FcPatternAddInteger (pat, FC_INDEX, id))
 	goto bail1;
diff --git a/src/fcpat.c b/src/fcpat.c
index 4dc5e4b..295ed02 100644
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -309,7 +309,7 @@ FcPatternDestroy (FcPattern *p)
 
     if (FcPatternFindFullFname (p))
     {
-	FcStrFree (FcPatternFindFullFname (p));
+	FcStrFree ((FcChar8 *)FcPatternFindFullFname (p));
 	FcPatternAddFullFname (p, 0);
     }
 
@@ -1276,14 +1276,8 @@ FcPatternDuplicate (const FcPattern *orig)
                                FcValueCanonicalize(&FcValueListPtrU(l)->value),
 			       FcTrue))
 		goto bail1;
-
-	if (!strcmp ((char *)FcObjectPtrU((e + i)->object), FC_FILE))
-	{
-	    FcChar8 * s;
-	    FcPatternGetString (orig, FC_FILE, 0, &s);
-	    FcPatternAddFullFname (new, FcPatternFindFullFname(orig));
-	}
     }
+    FcPatternTransferFullFname (orig, new);
 
     return new;
 
@@ -2003,5 +1997,7 @@ FcPatternTransferFullFname (const FcPattern *new, const FcPattern *orig)
 {
     FcChar8 * s;
     FcPatternGetString (orig, FC_FILE, 0, &s);
-    FcPatternAddFullFname (new, FcStrCopy (FcPatternFindFullFname(orig)));
+    FcPatternAddFullFname (new, 
+			   (char *)FcStrCopy 
+			   ((FcChar8 *)FcPatternFindFullFname(orig)));
 }