From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 17 Jul 2012 13:46:38 +0000 (+0200)
Subject: regenerate the flexer files with a recent flexml, so that there is no undefined behav... 
X-Git-Tag: v3_8~270
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/47b33fbc4c510ddf3eb9f8593d1b14cdf23188e2

regenerate the flexer files with a recent flexml, so that there is no undefined behavior concerning the char after terminating nul in strings
---

diff --git a/src/simdag/dax_dtd.c b/src/simdag/dax_dtd.c
index f0eae8158a..29c6072438 100644
--- a/src/simdag/dax_dtd.c
+++ b/src/simdag/dax_dtd.c
@@ -1498,13 +1498,24 @@ static int ck_ilimit()
 #ifdef FLEXML_NEED_BUFFERLIT
 static void dax__bufferliteral(char c, int* pp, const char* text)
 {
-  const char *s = (c ? strchr(text,c) : text-1), *e = strrchr(text,c);
-  assert(s <= e); BUFFERSET(*pp);
-  while (++s<e) {
-    if (isspace(*s) && c) { BUFFERPUTC(' '); while (isspace(*s)) ++s; }
-    else BUFFERPUTC(*s);
-  }
-  BUFFERDONE;
+   BUFFERSET(*pp);
+   if (c) {
+      const char *s = strchr(text, c), *e = strrchr(text, c);
+      assert(s && e && s <= e);
+      ++s;
+      while (s < e) {
+	 if (isspace(*s)) {
+	    BUFFERPUTC(' ');
+	    do ++s; while (s < e && isspace(*s));
+	 } else
+	   BUFFERPUTC(*s++);
+      }
+   } else {
+      const char *s = text;
+      while (*s)
+	BUFFERPUTC(*s++);
+   }
+   BUFFERDONE;
 }
 #endif
 
diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c
index 9e3ea7d60e..daded229ed 100644
--- a/src/surf/simgrid_dtd.c
+++ b/src/surf/simgrid_dtd.c
@@ -4776,13 +4776,24 @@ static int ck_ilimit()
 #ifdef FLEXML_NEED_BUFFERLIT
 static void surfxml_bufferliteral(char c, int* pp, const char* text)
 {
-  const char *s = (c ? strchr(text,c) : text-1), *e = strrchr(text,c);
-  assert(s <= e); BUFFERSET(*pp);
-  while (++s<e) {
-    if (isspace(*s) && c) { BUFFERPUTC(' '); while (isspace(*s)) ++s; }
-    else BUFFERPUTC(*s);
-  }
-  BUFFERDONE;
+   BUFFERSET(*pp);
+   if (c) {
+      const char *s = strchr(text, c), *e = strrchr(text, c);
+      assert(s && e && s <= e);
+      ++s;
+      while (s < e) {
+	 if (isspace(*s)) {
+	    BUFFERPUTC(' ');
+	    do ++s; while (s < e && isspace(*s));
+	 } else
+	   BUFFERPUTC(*s++);
+      }
+   } else {
+      const char *s = text;
+      while (*s)
+	BUFFERPUTC(*s++);
+   }
+   BUFFERDONE;
 }
 #endif
 
diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c
index c3353c3761..905fc9edb6 100644
--- a/src/xbt/graphxml.c
+++ b/src/xbt/graphxml.c
@@ -1257,13 +1257,24 @@ static int ck_ilimit()
 #ifdef FLEXML_NEED_BUFFERLIT
 static void graphxml_bufferliteral(char c, int* pp, const char* text)
 {
-  const char *s = (c ? strchr(text,c) : text-1), *e = strrchr(text,c);
-  assert(s <= e); BUFFERSET(*pp);
-  while (++s<e) {
-    if (isspace(*s) && c) { BUFFERPUTC(' '); while (isspace(*s)) ++s; }
-    else BUFFERPUTC(*s);
-  }
-  BUFFERDONE;
+   BUFFERSET(*pp);
+   if (c) {
+      const char *s = strchr(text, c), *e = strrchr(text, c);
+      assert(s && e && s <= e);
+      ++s;
+      while (s < e) {
+	 if (isspace(*s)) {
+	    BUFFERPUTC(' ');
+	    do ++s; while (s < e && isspace(*s));
+	 } else
+	   BUFFERPUTC(*s++);
+      }
+   } else {
+      const char *s = text;
+      while (*s)
+	BUFFERPUTC(*s++);
+   }
+   BUFFERDONE;
 }
 #endif