summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2005-04-13 09:11:52 +0000
committerRoss Burton <ross@burtonini.com>2005-04-13 09:11:52 +0000
commit2ff4f0760a700bf7c6e1ed4c5072a524b02243ca (patch)
tree36a8b9a9d270c12b51e15c594be9bf33a7e892a7
parentae7d0f35938693d250f09165fb6486b9e0f4b9bd (diff)
downloadfontconfig-2ff4f0760a700bf7c6e1ed4c5072a524b02243ca.tar.gz
Check that a pattern isn't already frozen in FcPatternFreeze
-rw-r--r--ChangeLog5
-rw-r--r--src/fcpat.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63c44cd..fbec32e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-13 Ross Burton <ross@burtonini.com>
+
+ * src/fcpat.c:
+ Check that a pattern isn't already frozen in FcPatternFreeze.
+
2005-03-31 Ross Burton <ross@burtonini.com>
* src/fclist.c:
diff --git a/src/fcpat.c b/src/fcpat.c
index 32054e1..c886c92 100644
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -538,6 +538,9 @@ FcPatternFreeze (FcPattern *p)
int size;
int i;
+ if (p->ref == FC_REF_CONSTANT)
+ return p;
+
size = sizeof (FcPattern) + p->num * sizeof (FcPatternElt);
b = (FcPattern *) malloc (size);
if (!b)