Applied patch by MauMau <maumau307@gmail.com> to escape filenames in #line statements.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 94cefdb2d2c..5233c82f432 100644
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -95,9 +95,22 @@ hashline_number(void)
 #endif
 		)
 	{
-		char	   *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename));
-
-		sprintf(line, "\n#line %d \"%s\"\n", yylineno, input_filename);
+		/* "* 2" here is for escaping \s below */
+		char	   *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename) * 2);
+		char	   *src,
+				   *dest;
+
+		sprintf(line, "\n#line %d \"", yylineno);
+		src = input_filename;
+		dest = line + strlen(line);
+		while (*src)
+		{
+			if (*src == '\\')
+				*dest++ = '\\';
+			*dest++ = *src++;
+		}
+		*dest = '\0';
+		strcat(dest, "\"\n");
 
 		return line;
 	}