Spurious characters in Fortran Fixed to free format conversion

albert-github · albert-github · commit dcedd9c1a270 · 2022-09-17T10:05:55.000+02:00
After review: protection against out of bounds.
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
@@ -1827,7 +1827,13 @@ const char* prepassFixedForm(const char* contents, int *hasContLine,int fixedCom
     return NULL;
   }
 
-  if (newContents[j] == '\n')
+  if (sizCont==0)
+  {
+    newContents = (char*)realloc(newContents, 2);
+    newContents[0] = '\n';
+    newContents[1] = '\000';
+  }
+  else if (newContents[j] == '\n')
   {
     newContents = (char*)realloc(newContents, j+2);
     newContents[j + 1] = '\000';

Original file line number	Diff line number	Diff line change
`@@ -1827,7 +1827,13 @@ const char* prepassFixedForm(const char* contents, int *hasContLine,int fixedCom`
`1827`	`1827`	`return NULL;`
`1828`	`1828`	`}`
`1829`	`1829`
`1830`		`- if (newContents[j] == '\n')`
	`1830`	`+ if (sizCont==0)`
	`1831`	`+ {`
	`1832`	`+ newContents = (char*)realloc(newContents, 2);`
	`1833`	`+ newContents[0] = '\n';`
	`1834`	`+ newContents[1] = '\000';`
	`1835`	`+ }`
	`1836`	`+ else if (newContents[j] == '\n')`
`1831`	`1837`	`{`
`1832`	`1838`	`newContents = (char*)realloc(newContents, j+2);`
`1833`	`1839`	`newContents[j + 1] = '\000';`