diff options
| author | Michael Meskes <meskes@postgresql.org> | 2015-06-12 14:52:55 +0200 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2015-06-13 11:04:58 +0200 |
| commit | 4f60d66587f6ed27887d20e3d70da61de5541ab2 (patch) | |
| tree | ea763e19ed5d5e1b355530a4530d3760703e0612 | |
| parent | 1c150f8aa759aaa9e5761da79653894510d868db (diff) | |
| download | postgresql-4f60d66587f6ed27887d20e3d70da61de5541ab2.tar.gz postgresql-4f60d66587f6ed27887d20e3d70da61de5541ab2.zip | |
Fixed some memory leaks in ECPG.
Patch by Michael Paquier
| -rw-r--r-- | src/interfaces/ecpg/preproc/descriptor.c | 12 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/variable.c | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index 053a7afda86..ebd95d3c4ba 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -175,6 +175,7 @@ output_get_descr(char *desc_name, char *index) for (results = assignments; results != NULL; results = results->next) { const struct variable *v = find_variable(results->variable); + char *str_zero = mm_strdup("0"); switch (results->value) { @@ -188,7 +189,8 @@ output_get_descr(char *desc_name, char *index) break; } fprintf(yyout, "%s,", get_dtype(results->value)); - ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, mm_strdup("0"), NULL, NULL); + ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL); + free(str_zero); } drop_assignments(); fputs("ECPGd_EODT);\n", yyout); @@ -292,8 +294,12 @@ output_set_descr(char *desc_name, char *index) case ECPGd_indicator: case ECPGd_length: case ECPGd_type: - fprintf(yyout, "%s,", get_dtype(results->value)); - ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, mm_strdup("0"), NULL, NULL); + { + char *str_zero = mm_strdup("0"); + fprintf(yyout, "%s,", get_dtype(results->value)); + ECPGdump_a_type(yyout, v->name, v->type, v->brace_level, NULL, NULL, -1, NULL, NULL, str_zero, NULL, NULL); + free(str_zero); + } break; default: diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 744a8d3a022..40e4eb8dfdb 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -27,7 +27,7 @@ extern YYSTYPE yylval; static int xcdepth = 0; /* depth of nesting in slash-star comments */ -static char *dolqstart; /* current $foo$ quote start string */ +static char *dolqstart = NULL; /* current $foo$ quote start string */ static YY_BUFFER_STATE scanbufhandle; static char *scanbuf; @@ -543,6 +543,8 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. } <SQL>{dolqdelim} { token_start = yytext; + if (dolqstart) + free(dolqstart); dolqstart = mm_strdup(yytext); BEGIN(xdolq); startlit(); diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c index 2ad7b5d255e..bb4b664b859 100644 --- a/src/interfaces/ecpg/preproc/variable.c +++ b/src/interfaces/ecpg/preproc/variable.c @@ -437,11 +437,13 @@ remove_variable_from_list(struct arguments ** list, struct variable * var) void dump_variables(struct arguments * list, int mode) { - char *str_zero = mm_strdup("0"); + char *str_zero; if (list == NULL) return; + str_zero = mm_strdup("0"); + /* * The list is build up from the beginning so lets first dump the end of * the list: |