Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit153affd

Browse files
author
Michael Meskes
committed
Fixed multibyte handling as reported by <harada.toshi@oss.ntt.co.jp>.
1 parentb8188e1 commit153affd

File tree

2 files changed

+34
-22
lines changed

2 files changed

+34
-22
lines changed

‎src/interfaces/ecpg/ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2165,5 +2165,9 @@ Fr 2. Feb 09:53:48 CET 2007
21652165

21662166
- Cleaned up va_list handling. Hopefully this now works on all archs.
21672167
- Applied Magnus Hagander's patch to take away some compiler warnings.
2168+
2169+
Su 11. Feb 16:09:31 CET 2007
2170+
2171+
- Fixed multibyte handling as reported by <harada.toshi@oss.ntt.co.jp>.
21682172
- Set ecpg library version to 5.3.
21692173
- Set ecpg version to 4.3.1.

‎src/interfaces/ecpg/ecpglib/execute.c‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.63 2007/02/02 08:58:23 meskes Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.64 2007/02/11 15:18:17 meskes Exp $ */
22

33
/*
44
* The aim is to get a simpler inteface to the database routines.
@@ -38,9 +38,11 @@
3838
staticchar*
3939
quote_postgres(char*arg,boolquote,intlineno)
4040
{
41-
char*res;
42-
inti,
43-
ri=0;
41+
char*res;
42+
interror;
43+
size_tlength;
44+
size_tescaped_len;
45+
size_tbuffer_len;
4446

4547
/*
4648
* if quote is false we just need to store things in a descriptor they
@@ -50,29 +52,35 @@ quote_postgres(char *arg, bool quote, int lineno)
5052
returnres=ECPGstrdup(arg,lineno);
5153
else
5254
{
53-
res= (char*)ECPGalloc(2*strlen(arg)+3,lineno);
55+
length=strlen(arg);
56+
buffer_len=2*length+1;
57+
res= (char*)ECPGalloc(buffer_len+3,lineno);
5458
if (!res)
5559
return (res);
5660

57-
/*
58-
* We don't know if the target database is using
59-
* standard_conforming_strings, so we always use E'' strings.
60-
*/
61-
if (strchr(arg,'\\')!=NULL)
62-
res[ri++]=ESCAPE_STRING_SYNTAX;
63-
64-
res[ri++]='\'';
65-
66-
for (i=0;arg[i];i++,ri++)
61+
error=0;
62+
escaped_len=PQescapeString(res+1,arg,buffer_len);
63+
if (error)
6764
{
68-
if (SQL_STR_DOUBLE(arg[i], true))
69-
res[ri++]=arg[i];
70-
res[ri]=arg[i];
65+
ECPGfree(res);
66+
returnNULL;
67+
}
68+
if (length==escaped_len)
69+
{
70+
res[0]=res[escaped_len+1]='\'';
71+
res[escaped_len+2]='\0';
72+
}
73+
else
74+
{
75+
/*
76+
* We don't know if the target database is using
77+
* standard_conforming_strings, so we always use E'' strings.
78+
*/
79+
memmove(res+2,res+1,escaped_len);
80+
res[0]=ESCAPE_STRING_SYNTAX;
81+
res[1]=res[escaped_len+2]='\'';
82+
res[escaped_len+3]='\0';
7183
}
72-
73-
res[ri++]='\'';
74-
res[ri]='\0';
75-
7684
ECPGfree(arg);
7785
returnres;
7886
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp