From 33b6073527ab903f336251b1428c23c257d38e7b Mon Sep 17 00:00:00 2001 From: Thomas Bonfort Date: Mon, 24 Sep 2012 11:35:21 +0200 Subject: [PATCH] fix typo leading to segfault in some multi-label conditions --- mapdraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapdraw.c b/mapdraw.c index 66768fd420..ac15adcd90 100644 --- a/mapdraw.c +++ b/mapdraw.c @@ -3094,9 +3094,9 @@ int msDrawLabelCache(imageObj *image, mapObj *map) } /* end POSITION AUTO vs Fixed POSITION */ if((!labelPtr->status || !label_marker_status) && classPtr->leader.maxdistance == 0) { + labelPtr->status = MS_OFF; break; /* no point looking at more labels, unless their is a leader defined, in which case we still want to compute the full cachePtr->poly to be used for offset tests */ - labelPtr->status = MS_OFF; } else { if(!cachePtr->poly) { cachePtr->poly = (shapeObj*)msSmallMalloc(sizeof(shapeObj));