Use item buffer macros consistently, avoiding excessively large buffers.

Author: rfm

Source/GSPrivate.h

@@ -96,6 +96,10 @@ typedef struct objc_category* Category;
  * the array and GS_ENDITEMBUF() to end it.  The idea is to ensure that small
  * arrays are allocated on the stack (for speed), but large arrays are
  * allocated from the heap (to avoid stack overflow).
+ * The first argument is the name to be used for a pointer to the buffer.
+ * The second argument is the number of items in the buffer.
+ * The third argument is the type of the items in the buffer.
+ * The minimum size of the buffer produced is sufficient to hold one item.
  */
 #if __GNUC__ > 3 && !defined(__clang__)
 __attribute__((unused)) static void GSFreeTempBuffer(void **b)

Source/GSString.m

@@ -5207,7 +5207,7 @@ - (void) replaceCharactersInRange: (NSRange)aRange
 	   */
 	  if (_flags.wide)
 	    {
-	      GS_BEGINITEMBUF(buf, (length * sizeof(unichar)), unichar);
+	      GS_BEGINITEMBUF(buf, length, unichar);
 
 	      [aString getCharacters: buf];
 	      if (offset < 0)
@@ -5224,7 +5224,7 @@ - (void) replaceCharactersInRange: (NSRange)aRange
 	    }
 	  else
 	    {
-	      GS_BEGINITEMBUF(buf, ((length+1) * sizeof(char)), char);
+	      GS_BEGINITEMBUF(buf, (length+1), char);
 
 	      [aString getCString: buf
 			maxLength: length+1

Source/NSNumberFormatter.m

@@ -1457,7 +1457,7 @@ - (NSNumber *) numberFromString: (NSString *)string
       UErrorCode 	err = U_ZERO_ERROR;
       int64_t 		intNum;
       double 		doubleNum;
-      GS_BEGINITEMBUF(ustring, length * sizeof(unichar), unichar)
+      GS_BEGINITEMBUF(ustring, length, unichar)
 
       [string getCharacters: ustring range: NSMakeRange(0, length)];
 

Source/NSPropertyList.m

@@ -1596,7 +1596,7 @@ static id parsePlItem(pldata* pld) NS_RETURNS_RETAINED
       unsigned char	*ptr;
       int		base = [output length];
       int		len = 0;
-      GS_BEGINITEMBUF(ustring, (length * sizeof(unichar)), unichar)
+      GS_BEGINITEMBUF(ustring, length, unichar)
 
       end = &ustring[length];
       [obj getCharacters: ustring];

Source/NSString.m

@@ -2669,8 +2669,7 @@ - (NSRange) rangeOfString: (NSString *)aString
 
               /* Range to search is bigger than string to look for.
                */
-              GS_BEGINITEMBUF2(charsSelf, (searchRange.length*sizeof(unichar)),
-                unichar)
+              GS_BEGINITEMBUF2(charsSelf, searchRange.length, unichar)
               [self getCharacters: charsSelf range: searchRange];
               end = searchRange.length;
               if ((mask & NSCaseInsensitiveSearch) == NSCaseInsensitiveSearch)
@@ -2763,7 +2762,7 @@ - (NSRange) rangeOfString: (NSString *)aString
         }
       else
         {
-          GS_BEGINITEMBUF(charsOther, (countOther*sizeof(unichar)), unichar)
+          GS_BEGINITEMBUF(charsOther, countOther, unichar)
 
           [aString getCharacters: charsOther range: NSMakeRange(0, countOther)];
           if (YES == insensitive)
@@ -2782,7 +2781,7 @@ - (NSRange) rangeOfString: (NSString *)aString
             {
               /* Range to search is same size as string to look for.
                */
-              GS_BEGINITEMBUF2(charsSelf, (countOther*sizeof(unichar)), unichar)
+              GS_BEGINITEMBUF2(charsSelf, countOther, unichar)
               if ((mask & NSBackwardsSearch) == NSBackwardsSearch)
                 {
                   searchRange.location = NSMaxRange(searchRange) - countOther;
@@ -2843,8 +2842,7 @@ - (NSRange) rangeOfString: (NSString *)aString
                 }
               /* Range to search is bigger than string to look for.
                */
-              GS_BEGINITEMBUF2(charsSelf, (searchRange.length*sizeof(unichar)),
-                unichar)
+              GS_BEGINITEMBUF2(charsSelf, searchRange.length, unichar)
               [self getCharacters: charsSelf range: searchRange];
 
               if (YES == insensitive)
@@ -2955,8 +2953,8 @@ - (NSRange) rangeOfString: (NSString *)aString
 	  UErrorCode    status = U_ZERO_ERROR; 
 	  NSUInteger    countSelf = searchRange.length;
 	  UStringSearch *search = NULL;
-          GS_BEGINITEMBUF(charsSelf, (countSelf * sizeof(unichar)), unichar)
-          GS_BEGINITEMBUF2(charsOther, (countOther * sizeof(unichar)), unichar)
+          GS_BEGINITEMBUF(charsSelf, countSelf, unichar)
+          GS_BEGINITEMBUF2(charsOther, countOther, unichar)
 
 	  // Copy to buffer
 
@@ -4875,7 +4873,8 @@ - (NSString*) stringByDeletingLastPathComponent
       unichar	*to;
       unsigned	o;
       unsigned	lastComponent = root;
-      GS_BEGINITEMBUF(from, (end * 2 * sizeof(unichar)), unichar)
+      unsigned	space = end * 2;		// from and to in same buffer
+      GS_BEGINITEMBUF(from, space, unichar)
 
       to = from + end;
       [self getCharacters: from range: NSMakeRange(0, end)];