database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-24 14:22:24 +03:00
Code Activity

Repair coredump in COPY OUT when client encoding is different from

Browse Source 
server encoding, per report from Nicolai Tufar.  This is a minimum-risk
patch for 7.3.1 --- I intend to apply a more general repair in HEAD.
This commit is contained in:
Tom Lane
2002-12-01 17:33:33 +00:00
parent f278d8134e
commit cc7883a1a2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/commands/copy.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.177 2002/10/19 00:25:36 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.177.2.1 2002/12/01 17:33:33 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1470,9 +1470,8 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
char *string; char *string;
char c; char c;
char delimc = delim[0]; char delimc = delim[0];
bool same_encoding; bool same_encoding;
char *string_start; char *string_start = NULL;
int mblen; int mblen;
int i; int i;
@ -1481,12 +1480,12 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
{ {
string = (char *) pg_server_to_client((unsigned char *) server_string, string = (char *) pg_server_to_client((unsigned char *) server_string,
strlen(server_string)); strlen(server_string));
string_start = string; if (string != server_string)
string_start = string;
} }
else else
{ {
string = server_string; string = server_string;
string_start = NULL;
} }
for (; (c = *string) != '\0'; string += mblen) for (; (c = *string) != '\0'; string += mblen)