Fix bad behaviour on realloc resulting in crash.

reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index a5eec3fa913fc1bdc745bec8bc26f417cdc2e98b..455e35b3bd13aaef78b01389fadc2c251a9192b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-11  Ming Zhao  <ming@gentoo.org>
+       reviewed by: plam
+       
+       * src/fcname.c (FcObjectToPtrLookup):
+
+       Fix bad behaviour on realloc resulting in crash.
+
 2006-04-11  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcGlobalCacheReadDir):
 

diff --git a/src/fcname.c b/src/fcname.c
index a0a84a394237ceb1f83742a1f8175645ab05f0a0..aa494751ac46220775e058f632c0253fe122e658 100644 (file)
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -193,7 +193,8 @@ FcObjectToPtrLookup (const char * object)
 {
     FcObjectPtr                    i = 0, n;
     const FcObjectTypeList  *l;
-    FcObjectType           *t = _FcUserObjectNames;
+    FcObjectType           *t = _FcUserObjectNames, *origNames;
+    FcBool                 replace;
 
     for (l = _FcObjectTypes; l; l = l->next)
     {
@@ -212,25 +213,27 @@ FcObjectToPtrLookup (const char * object)
 
     /* We didn't match.  Look for the application's FcObjectTypeList
      * and replace it in-place. */
+    origNames = _FcUserObjectNames;
     for (l = _FcObjectTypes; l; l = l->next)
     {
        if (l->types == _FcUserObjectNames)
            break;
     }
 
+    replace = l && l->types == _FcUserObjectNames;
     if (!_FcUserObjectNames || 
-        (l && l->types == _FcUserObjectNames && user_obj_alloc < l->ntypes))
+        (replace && user_obj_alloc <= l->ntypes))
     {
        int nt = user_obj_alloc + 4;
-        FcObjectType * t = realloc (_FcUserObjectNames, 
+        FcObjectType * tt = realloc (_FcUserObjectNames, 
                                    nt * sizeof (FcObjectType));
-        if (!t)
+        if (!tt)
             return 0;
-       _FcUserObjectNames = t;
+       _FcUserObjectNames = tt;
        user_obj_alloc = nt;
     }
 
-    if (l && l->types == _FcUserObjectNames)
+    if (replace)
     {
        n = l->ntypes;
        FcNameUnregisterObjectTypesFree (l->types, l->ntypes, FcFalse);
@@ -242,7 +245,7 @@ FcObjectToPtrLookup (const char * object)
 
     for (l = _FcObjectTypes; l; l = l->next)
     {
-       if (l->types == _FcUserObjectNames)
+       if (l->types == origNames)
        {
            t = (FcObjectType *)l->types;
            break;