postgres.git / summary / log / commit / refs
commit 7d114fb46fd2b88cfab05f8e36ba9e9762cd576a
Author: Michael Meskes <meskes@postgresql.org>
Date: Fri Jul 05 09:07:16 2013 +0000
First released in: 8.4.18, 9.0.14, 9.1.10, 9.2.5, 9.3.0
Applied patch by MauMau <maumau307@gmail.com> to escape filenames in #line statements.
src/interfaces/ecpg/preproc/output.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 389a5272d44..616e8f04008 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;
}
[parent: cf183732d2b2]