File tree 1 file changed +6
-6
lines changed
1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -2949,11 +2949,6 @@ int freeClass(classObj *class)
2949
2949
}
2950
2950
}
2951
2951
}
2952
- if ( class -> numstyles == 0 && class -> styles != NULL &&
2953
- class -> styles [0 ] != NULL ) {
2954
- /* msGrowClassStyles() creates class->styles[0] during the first call */
2955
- msFree (class -> styles [0 ]);
2956
- }
2957
2952
msFree (class -> styles );
2958
2953
2959
2954
for (i = 0 ; i < class -> numlabels ; i ++ ) { /* each label */
@@ -3276,7 +3271,12 @@ int loadClass(classObj *class, layerObj *layer)
3276
3271
if (msGrowClassStyles (class ) == NULL )
3277
3272
return (-1 );
3278
3273
initStyle (class -> styles [class -> numstyles ]);
3279
- if (loadStyle (class -> styles [class -> numstyles ]) != MS_SUCCESS ) return (-1 );
3274
+ if (loadStyle (class -> styles [class -> numstyles ]) != MS_SUCCESS ) {
3275
+ freeStyle (class -> styles [class -> numstyles ]);
3276
+ free (class -> styles [class -> numstyles ]);
3277
+ class -> styles [class -> numstyles ] = NULL ;
3278
+ return (-1 );
3279
+ }
3280
3280
class -> numstyles ++ ;
3281
3281
break ;
3282
3282
case (TEMPLATE ):
You can’t perform that action at this time.
0 commit comments