Suggested changes for the case when the file begings with a new line.

src/map/amap/amapRead.c

@@ -129,24 +129,32 @@ void Amap_RemoveComments( char * pBuffer, int * pnDots, int * pnLines )
       {
         // if this is the beginning of comment
         // clean it with spaces until the new line statement
-        if ( *pCur == '#' )
-            while ( *pCur != '\n' )
+        if ( *pCur == '#' ) {
+          while ( *pCur != '\n' ) {
             *pCur++ = ' ';
-    
+          }
+        }    
         // count the number of new lines and dots
         if ( *pCur == '\n' ) {
-        if (*(pCur-1)=='\r') {
+          if (pCur > pBuffer) {
+            if (*(pCur - 1) == '\r') {
               // DOS(R) file support
-        if (*(pCur-2)!='\\') nLines++;
+              if (pCur > (pBuffer + 1)) {
+                if (*(pCur - 2)!='\\') {
+                  nLines++;
+                }
                 else {
                   // rewind to backslash and overwrite with a space
-            *(pCur-2) = ' ';
-            *(pCur-1) = ' ';
+                  *(pCur - 2) = ' ';
+                  *(pCur - 1) = ' ';
                   *pCur = ' ';
                 }
+              }
             } else {
               // UNIX(TM) file support
-        if (*(pCur-1)!='\\') nLines++;
+              if (*(pCur - 1) != '\\') {
+                nLines++;
+              }
               else {
                 // rewind to backslash and overwrite with a space
                 *(pCur-1) = ' ';
@@ -154,9 +162,12 @@ void Amap_RemoveComments( char * pBuffer, int * pnDots, int * pnLines )
               }
             }
           }
-        else if ( *pCur == '.' )
+        }
+        else if ( *pCur == '.' ) {
           nDots++;
         }
+      }
+
     if ( pnDots )
       *pnDots = nDots; 
     if ( pnLines )
@@ -491,4 +502,3 @@ Amap_Lib_t * Amap_LibReadFile( char * pFileName, int fVerbose )
 
 
 ABC_NAMESPACE_IMPL_END
-

src/map/mio/mioRead.c

@@ -737,34 +737,45 @@ void Io_ReadFileRemoveComments( char * pBuffer, int * pnDots, int * pnLines )
       {
         // if this is the beginning of comment
         // clean it with spaces until the new line statement
-        if ( *pCur == '#' )
-            while ( *pCur != '\n' )
+        if ( *pCur == '#' ) {
+          while ( *pCur != '\n' ) {
             *pCur++ = ' ';
-    
+          }
+        }
         // count the number of new lines and dots
         if ( *pCur == '\n' ) {
-        if (*(pCur-1)=='\r') {
+          if (pCur > pBuffer) {
+            if (*(pCur - 1) == '\r') {
               // DOS(R) file support
-        if (*(pCur-2)!='\\') nLines++;
+              if (pCur > (pBuffer + 1)) {
+                if (*(pCur - 2) != '\\') {
+                  nLines++;
+                }
                 else {
                   // rewind to backslash and overwrite with a space
-            *(pCur-2) = ' ';
-            *(pCur-1) = ' ';
+                  *(pCur - 2) = ' ';
+                  *(pCur - 1) = ' ';
                   *pCur = ' ';
                 }
+              }
             } else {
               // UNIX(TM) file support
-        if (*(pCur-1)!='\\') nLines++;
+              if (*(pCur - 1) != '\\') {
+                nLines++;
+              }
               else {
                 // rewind to backslash and overwrite with a space
-            *(pCur-1) = ' ';
+                *(pCur - 1) = ' ';
                 *pCur = ' ';
               }
             }
           }
-        else if ( *pCur == '.' )
+        }
+        else if ( *pCur == '.' ) {
           nDots++;
         }
+      }
+
     if ( pnDots )
         *pnDots = nDots; 
     if ( pnLines )