Ticket #13526: 0001-Critical-cleanup-code-for-GetUnicodeBlocks-and-Inclu.patch

src/servers/app/ServerFont.cpp

@@ -500 +500 @@
     uint32 block = 0;
     const uint8 BITS_PER_BLOCK = 32;
     uint32 currentCodePoint = 0;
-    
+
+    if (baseCodePoint > kUnicodeBlockMap[kNumUnicodeBlockRanges-1].end)
+        return;
+
     for (int i = 0; i < FC_CHARSET_MAP_SIZE; ++i) {
         FcChar32 curMapBlock = charMap[i];
         int32 rangeStart = -1;
         int32 startBlock = -1;
         int32 endBlock = -1;
         uint32 startPoint = 0;
-    
+
         currentCodePoint = baseCodePoint + block;
-                
-        for (int bit = 0; bit < BITS_PER_BLOCK; ++bit) {        
+
+        for (int bit = 0; bit < BITS_PER_BLOCK; ++bit) {
             if (curMapBlock == 0 && startBlock < 0)
                 // if no more bits are set then short-circuit the loop
                 break;
-            
+
             if ((curMapBlock & 0x1) != 0 && rangeStart < 0) {
                 rangeStart = bit;
                 startPoint = currentCodePoint + rangeStart;
@@ -522 +525 @@
                 if (startBlock >= 0) {
                     blocksForMap = blocksForMap
                         | kUnicodeBlockMap[startBlock].block;
-                } 
+                }
             } else if (rangeStart >= 0 && startBlock >= 0) {
                     // when we find an empty bit, that's the end of the range
                 uint32 endPoint = currentCodePoint + (bit - 1);
@@ -546 +549 @@
                 startBlock = -1;
                 endBlock = -1;
                 rangeStart = -1;
-            } 
+            }
 
             curMapBlock >>= 1;
         }
-        
+
         if (rangeStart >= 0 && startBlock >= 0) {
                 // if we hit the end of the block and had
                 // found a start of the range then we
@@ -597 +600 @@
         return B_ERROR;
 
     FcCharSet *charSet = FcFreeTypeCharSet(face, NULL);
-    if (charSet == NULL)
+    if (charSet == NULL) {
+        PutTransformedFace(face);
         return B_ERROR;
+    }
 
     FcChar32 charMap[FC_CHARSET_MAP_SIZE];
     FcChar32 next = 0;
@@ -609 +614 @@
         baseCodePoint = FcCharSetNextPage(charSet, charMap, &next);
     }
 
+    FcCharSetDestroy(charSet);
+    PutTransformedFace(face);
 #endif // FONTCONFIG_ENABLED
 
     return B_OK;
@@ -633 +640 @@
         return B_ERROR;
 
     FcCharSet *charSet = FcFreeTypeCharSet(face, NULL);
-    if (charSet == NULL)
+    if (charSet == NULL) {
+        PutTransformedFace(face);
         return B_ERROR;
+    }
 
     uint32 curCodePoint = start;
 
@@ -649 +658 @@
         ++curCodePoint;
     }
 
+    FcCharSetDestroy(charSet);
+    PutTransformedFace(face);
 #endif // FONTCONFIG_ENABLED
 
     return B_OK;