git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c

index 053a7afda863104859e56ea7c1d3105b253cdebd..ebd95d3c4ba80cba95b282dc2a0db60a4d5673bb 100644 (file)

--- a/src/interfaces/ecpg/preproc/descriptor.c

+++ b/src/interfaces/ecpg/preproc/descriptor.c

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)

{

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);

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 c70f2986962d6323b8ae197e8a21f1985649cacc..0453409d373cab6c93f022b4d7d4f64db548c9e6 100644 (file)

--- a/src/interfaces/ecpg/preproc/pgc.l

+++ b/src/interfaces/ecpg/preproc/pgc.l

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;

}

<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 2ad7b5d255eddf4f38d580cccb4c1a41f262ba4d..bb4b664b859ec996d0daf86435916efb2348a713 100644 (file)

--- a/src/interfaces/ecpg/preproc/variable.c

+++ b/src/interfaces/ecpg/preproc/variable.c

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: