loadProjection(): fix memleak in error code path

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52472
MapServer · Oct 16, 2022 · 00a3cbc · 00a3cbc
1 parent 63f1530
commit 00a3cbc
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/mapfile.c b/mapfile.c
@@ -1138,8 +1138,6 @@ static void writeGrid(FILE *stream, int indent, graticuleObj *pGraticule)
 
 static int loadProjection(projectionObj *p)
 {
-  int i=0;
-
   p->gt.need_geotransform = MS_FALSE;
 
   if ( p->proj != NULL || p->numargs != 0 ) {
@@ -1154,16 +1152,16 @@ static int loadProjection(projectionObj *p)
         msSetError(MS_EOFERR, NULL, "loadProjection()");
         return(-1);
       case(END):
-        if( i == 1 && strstr(p->args[0],"+") != NULL ) {
+        if( p->numargs == 1 && strstr(p->args[0],"+") != NULL ) {
           char *one_line_def = p->args[0];
           int result;
 
           p->args[0] = NULL;
+          p->numargs = 0;
           result = msLoadProjectionString( p, one_line_def );
           free( one_line_def );
           return result;
         } else {
-          p->numargs = i;
           if(p->numargs != 0)
             return msProcessProjection(p);
           else
@@ -1172,15 +1170,14 @@ static int loadProjection(projectionObj *p)
         break;
       case(MS_STRING):
       case(MS_AUTO):
-        if( i == MS_MAXPROJARGS ) {
+        if( p->numargs == MS_MAXPROJARGS ) {
             msSetError(MS_MISCERR, "Parsing error near (%s):(line %d): Too many arguments in projection string", "loadProjection()",
                    msyystring_buffer, msyylineno);
-            p->numargs = i;
             return -1;
         }
-        p->args[i] = msStrdup(msyystring_buffer);
+        p->args[p->numargs] = msStrdup(msyystring_buffer);
         p->automatic = MS_TRUE;
-        i++;
+        p->numargs++;
         break;
       default:
         msSetError(MS_IDENTERR, "Parsing error near (%s):(line %d)", "loadProjection()",