database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Backported bug fix for #2956.

Browse Source
This commit is contained in:
Michael Meskes
2007-02-27 13:27:05 +00:00
parent 355451be0e
commit e9a97570fa
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/interfaces/ecpg/ecpglib/execute.c
View File

@@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.43.2.9 2007/02/06 09:41:52 meskes Exp $ */
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.43.2.10 2007/02/27 13:27:05 meskes Exp $ */
/*
* The aim is to get a simpler inteface to the database routines.
@@ -38,27 +38,45 @@
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 + 3, lineno);
if (!res)
return (res);
if (strchr(arg, '\\') != NULL)
res[ri++] = ESCAPE_STRING_SYNTAX;
res[ri++] = '\'';
for (i = 0; arg[i]; i++, ri++)
error = 0;
escaped_len = PQescapeString(res+1, arg, buffer_len);
if (error)
{
if (SQL_STR_DOUBLE(arg[i]))
res[ri++] = arg[i];
res[ri] = arg[i];
ECPGfree(res);
return NULL;
}
if (length == escaped_len)
{
res[0] = res[escaped_len+1] = '\'';
res[escaped_len+2] = '\0';
}
else
{
/*
* We don't know if the target database is using
* standard_conforming_strings, so we always use E'' strings.
*/
memmove(res+2, res+1, escaped_len);
res[0] = ESCAPE_STRING_SYNTAX;
res[1] = res[escaped_len+2] = '\'';
res[escaped_len+3] = '\0';
}
res[ri++] = '\'';
res[ri] = '\0';
ECPGfree(arg);
return res;
}