fix for PR#18784

git-svn-id: https://svn.r-project.org/R/trunk@87393 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: murrell

doc/NEWS.Rd

@@ -399,6 +399,11 @@
       \item \code{cbind()} could segfault with \code{NULL} inputs.
       (Seen when \R was built with \command{gcc14}, LTO and C99 inlining
       semantics.)
+
+      \item Fix segfault on \code{quartz()} from \code{grid.glyph()}
+      call with \code{glyphInfo()} that describes non-existent font
+      (\PR{18784}).  Thanks to \I{Tomek Gieorgijewski}.
+  
     }
   }
 }

src/library/grDevices/src/devQuartz.c

@@ -3024,13 +3024,12 @@ void RQuartz_glyph(int n, int *glyphs, double *x, double *y,
     CFArrayRef cfFontDescriptors = 
         CTFontManagerCreateFontDescriptorsFromURL(cfFontURL);
     CFRelease(cfFontURL);
-    int n_fonts = CFArrayGetCount(cfFontDescriptors);
-    if (n_fonts > 0) {
+    if (cfFontDescriptors) {
         /* NOTE: that the font needs an inversion (in y) matrix
            because the device has an inversion in user space 
            (for bitmap devices anyway) */
         CGAffineTransform trans = CGAffineTransformMakeScale(1.0, -1.0);
-	if (rot != 0.0) trans = CGAffineTransformRotate(trans, rot/180.*M_PI);
+        if (rot != 0.0) trans = CGAffineTransformRotate(trans, rot/180.*M_PI);
         CTFontRef ctFont = 
             CTFontCreateWithFontDescriptor((CTFontDescriptorRef) CFArrayGetValueAtIndex(cfFontDescriptors, 0), size, &trans);
 
@@ -3049,10 +3048,10 @@ void RQuartz_glyph(int n, int *glyphs, double *x, double *y,
         }
         CGColorRelease(fillColorRef);
         CFRelease(ctFont);
+        CFRelease(cfFontDescriptors);
     } else {
         warning(_("Failed to load font"));
     }
-    CFRelease(cfFontDescriptors);
 
     QuartzEnd(grouping, layer, ctx, savedCTX, xd);
 }