From 04477c2e1b644e9cf9288e9da64b0d80cf811ac9 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Tue, 27 Feb 2007 13:26:59 +0000 Subject: [PATCH] Backported bug fix for #2956. --- src/interfaces/ecpg/ecpglib/execute.c | 39 +++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 1baf577016..d348d9d2e2 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -38,33 +38,32 @@ static char * quote_postgres(char *arg, int lineno) { - char *res = (char *) ECPGalloc(2 * strlen(arg) + 3, lineno); - int i, - ri = 0; + char *res; + int error; + size_t length; + size_t escaped_len; + size_t buffer_len; + /* + * if quote is false we just need to store things in a descriptor they + * will be quoted once they are inserted in a statement + */ + length = strlen(arg); + buffer_len = 2 * length + 1; + res = (char *) ECPGalloc(buffer_len + 2, lineno); if (!res) return (res); - res[ri++] = '\''; - - for (i = 0; arg[i]; i++, ri++) + error = 0; + escaped_len = PQescapeString(res+1, arg, buffer_len); + if (error) { - switch (arg[i]) - { - case '\'': - res[ri++] = '\''; - break; - case '\\': - res[ri++] = '\\'; - break; - default: - ; - } - res[ri] = arg[i]; + ECPGfree(res); + return NULL; } - res[ri++] = '\''; - res[ri] = '\0'; + res[0] = res[escaped_len+1] = '\''; + res[escaped_len+2] = '\0'; ECPGfree(arg); return res; -- 2.39.5