[mapserver-commits] r11484 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-04-06 19:56:14 -0700 (Wed, 06 Apr 2011)
New Revision: 11484

Modified:
   trunk/mapserver/maptemplate.c
Log:
Avoid Windows issue in fread() check (#3814)

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2011-04-07 02:31:26 UTC (rev 11483)
+++ trunk/mapserver/maptemplate.c	2011-04-07 02:56:14 UTC (rev 11484)
@@ -3092,12 +3092,15 @@
    /*
     * Read all the template file
     */
+   fread(file, length, 1, stream);
+/* Disabled for now due to Windows issue, see ticket #3814
    if( 1 != fread(file, length, 1, stream)) {
      msSetError(MS_IOERR, "Error while reading template file.", "generateLegendTemplate()");
      free(file);
      fclose(stream);
      return NULL;
    }
+*/
    file[length] = '\0';
 
    if(msValidateContexts(mapserv->map) != MS_SUCCESS) return NULL; /* make sure there are no recursive REQUIRES or LABELREQUIRES expressions */