8360147: Better Glyph drawing redux

Reviewed-by: rhalade, ahgross, psadhukhan, jdv

Author: prrace

src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m

@@ -974,23 +974,28 @@ @implementation CGGI_GlyphCanvas
  return;
  }
 
- // just do one malloc, and carve it up for all the buffers
- void *buffer = malloc((sizeof(CGRect) + sizeof(CGSize) + sizeof(CGGlyph) + sizeof(UnicodeScalarValue)) * len);
- if (buffer == NULL) {
+ CGRect *bboxes = (CGRect*)calloc(len, sizeof(CGRect));
+ CGSize *advances = (CGSize*)calloc(len, sizeof(CGSize));
+ CGGlyph *glyphs = (CGGlyph*)calloc(len, sizeof(CGGlyph));
+ UnicodeScalarValue *uniChars = (UnicodeScalarValue*)calloc(len, sizeof(UnicodeScalarValue));
+
+ if (bboxes == NULL || advances == NULL || glyphs == NULL || uniChars == NULL) {
+ free(bboxes);
+ free(advances);
+ free(glyphs);
+ free(uniChars);
  [[NSException exceptionWithName:NSMallocException
  reason:@"Failed to allocate memory for the temporary glyph strike and measurement buffers." userInfo:nil] raise];
  }
 
- CGRect *bboxes = (CGRect *)(buffer);
- CGSize *advances = (CGSize *)(bboxes + sizeof(CGRect) * len);
- CGGlyph *glyphs = (CGGlyph *)(advances + sizeof(CGGlyph) * len);
- UnicodeScalarValue *uniChars = (UnicodeScalarValue *)(glyphs + sizeof(UnicodeScalarValue) * len);
-
  CGGI_CreateGlyphsAndScanForComplexities(glyphInfos, strike, &mode,
  rawGlyphCodes, uniChars, glyphs,
  advances, bboxes, len);
 
- free(buffer);
+ free(bboxes);
+ free(advances);
+ free(glyphs);
+ free(uniChars);
 }
 
 #define TX_FIXED_UNSAFE(v) (isinf(v) || isnan(v) || fabs(v) >= (1<<30))