From a3d20dc44644cddcee08f84c4a6bcd4f6cabdf52 Mon Sep 17 00:00:00 2001
From: Sven Buijssen <sven.buijssen@tu-dortmund.de>
Date: Wed, 24 Oct 2012 16:21:45 +0200
Subject: [PATCH] BUG #13558. Fixed segfault in gmvread.c for comment lines
 exceeding 99 chars

    Do not rely on fscanf() + a fixed length character array any more when
    parsing comments. Arbitrary comment line length supported now, as did GMV
    binary releases.
---
 databases/GMV/gmvread.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/databases/GMV/gmvread.c b/databases/GMV/gmvread.c
index 803819f..76b6774 100755
--- a/databases/GMV/gmvread.c
+++ b/databases/GMV/gmvread.c
@@ -3978,16 +3978,41 @@ void readcomments(FILE* gmvin, int ftype)
   /*  Read through (ignore) comments.  */
   /*                                   */
   int rdcomms;
-  char varname[100];
+#define MAXCOMMENTLINELENGTH 100
+  char varname[MAXCOMMENTLINELENGTH];
+  int firstNonWS;
 
    /*  Read comments until endcomm found.  */
    rdcomms = 1;
    while (rdcomms)
      {
-      fscanf(gmvin,"%s",varname);
+      /* fscanf(gmvin,"%s",varname); */
+      fgets(varname, MAXCOMMENTLINELENGTH, gmvin);
+      /* Ignore leading whitespace characters as would have done fscanf() */
+      firstNonWS = 0;
+      while (firstNonWS < MAXCOMMENTLINELENGTH)
+	if (*(varname+firstNonWS) == 0x09 || /* horizontal tab */
+	    *(varname+firstNonWS) == 0x0a || /* linefeed */
+	    *(varname+firstNonWS) == 0x0b || /* vertical tab */
+	    *(varname+firstNonWS) == 0x0c || /* form feed */
+	    *(varname+firstNonWS) == 0x0d || /* carriage return */
+	    *(varname+firstNonWS) == 0x20)   /* space */
+	  firstNonWS++;
+	else
+	  break;
       ioerrtst(gmvin);
-      if (strncmp(varname,"endcomm",7) == 0)
+      if (strncmp(&varname[firstNonWS],"endcomm",7) == 0)
          rdcomms = 0;
+      else
+	{
+	  /* Only support "endcomm" with leading blanks, if any.
+	     Read reminder of comment line, in chunks. */
+	  while (varname[strlen(varname)-1] != '\n')
+	    {
+	      fgets(varname, MAXCOMMENTLINELENGTH, gmvin);
+	      ioerrtst(gmvin);
+	    }
+	}
      }
 
    /*  If binary file, read space after endcomm.  */
-- 
1.7.11.3