avoid segfault when font file could not be loaded

MapServer · Sep 27, 2012 · fc70e2c · fc70e2c
1 parent 5066401
commit fc70e2c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/maplabel.c b/maplabel.c
@@ -223,7 +223,12 @@ char *msAlignText(mapObj *map, labelObj *label, char *text)
   /*length in pixels of the longest line*/
   maxlinelength=0;
   for(i=0; i<numlines; i++) {
-    msGetLabelSize(map,label,textlines[i],label->size, &label_rect,NULL);
+    if(MS_SUCCESS != msGetLabelSize(map,label,textlines[i],label->size, &label_rect,NULL)) {
+      msFreeCharArray(textlines,numlines);
+      msFree(textlinelengths);
+      msFree(numspacesforpadding);
+      return text;
+    }
     textlinelengths[i] = label_rect.maxx-label_rect.minx;
     if(maxlinelength<textlinelengths[i])
       maxlinelength=textlinelengths[i];