NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5fdefbc

committed

From: t-ishii@sra.co.jpAs mentioned around line 1153 in backend/commands/copy.c, the methodof array checking is not perfect.test=> create table t1 (i text);test=> insert into t1 values('{\\.}');INSERT 2645600 1test=> select * from t1;i-----{\\.}(2 rows)test=> copy t1 to '/tmp/aaa';test=> copy t1 from '/tmp/aaa';ERROR: CopyReadAttribute - end of record marker corruptedCopy cannot read data produced by itself!

1 parent7a7770e commit5fdefbcCopy full SHA for 5fdefbc

File tree

1 file changed

-15

lines changed

src/backend/commands
- copy.c

1 file changed

-15

lines changed

`‎src/backend/commands/copy.c`

Lines changed: 9 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.46 1998/06/15 19:28:13 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.47 1998/06/19 11:40:46 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -61,7 +61,7 @@ static char CopyReadAttribute(FILE fp, bool isnull, char delim, int *newline`
`61`	`61`	`staticcharCopyReadAttribute(FILEfp,boolisnull,chardelim);`
`62`	`62`
`63`	`63`	`#endif`
`64`		`-staticvoidCopyAttributeOut(FILEfp,charstring,char*delim);`
	`64`	`+staticvoidCopyAttributeOut(FILEfp,charstring,char*delim,intis_array);`
`65`	`65`	`staticintCountTuples(Relationrelation);`
`66`	`66`
`67`	`67`	`externFILE*Pfout,`
`@@ -277,7 +277,7 @@ CopyTo(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`277`	`277`	`{`
`278`	`278`	`string= (char) (fmgr_faddr(&out_functions[i]))`
`279`	`279`	`(value,elements[i],typmod[i]);`
`280`		`-CopyAttributeOut(fp,string,delim);`
	`280`	`+CopyAttributeOut(fp,string,delim,attr[i]->attnelems);`
`281`	`281`	`pfree(string);`
`282`	`282`	`}`
`283`	`283`	`else`
`@@ -554,7 +554,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`554`	`554`	`{`
`555`	`555`	`loaded_oid=oidin(string);`
`556`	`556`	`if (loaded_oid<BootstrapObjectIdData)`
`557`		`-elog(ERROR,"COPY TEXT: Invalid Oid");`
	`557`	`+elog(ERROR,"COPY TEXT: Invalid Oid. line: %d",lineno);`
`558`	`558`	`}`
`559`	`559`	`}`
`560`	`560`	`for (i=0;i<attr_count&& !done;i++)`
`@@ -603,7 +603,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`603`	`603`	`{`
`604`	`604`	`fread(&loaded_oid,sizeof(int32),1,fp);`
`605`	`605`	`if (loaded_oid<BootstrapObjectIdData)`
`606`		`-elog(ERROR,"COPY BINARY: Invalid Oid");`
	`606`	`+elog(ERROR,"COPY BINARY: Invalid Oid line: %d",lineno);`
`607`	`607`	`}`
`608`	`608`	`fread(&null_ct,sizeof(int32),1,fp);`
`609`	`609`	`if (null_ct>0)`
`@@ -642,7 +642,7 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`642`	`642`	`ptr+=sizeof(int32);`
`643`	`643`	`break;`
`644`	`644`	`default:`
`645`		`-elog(ERROR,"COPY BINARY: impossible size!");`
	`645`	`+elog(ERROR,"COPY BINARY: impossible size! line: %d",lineno);`
`646`	`646`	`break;`
`647`	`647`	`}`
`648`	`648`	`}`
`@@ -1099,7 +1099,7 @@ CopyReadAttribute(FILE fp, bool isnull, char *delim)`
`1099`	`1099`	`case'.':`
`1100`	`1100`	`c=getc(fp);`
`1101`	`1101`	`if (c!='\n')`
`1102`		`-elog(ERROR,"CopyReadAttribute - end of record marker corrupted");`
	`1102`	`+elog(ERROR,"CopyReadAttribute - end of record marker corrupted. line: %d",lineno);`
`1103`	`1103`	`return (NULL);`
`1104`	`1104`	`break;`
`1105`	`1105`	`}`
`@@ -1115,22 +1115,16 @@ CopyReadAttribute(FILE fp, bool isnull, char *delim)`
`1115`	`1115`	`if (!done)`
`1116`	`1116`	`attribute[i++]=c;`
`1117`	`1117`	`if (i==EXT_ATTLEN-1)`
`1118`		`-elog(ERROR,"CopyReadAttribute - attribute length too long");`
	`1118`	`+elog(ERROR,"CopyReadAttribute - attribute length too long. line: %d",lineno);`
`1119`	`1119`	`}`
`1120`	`1120`	`attribute[i]='\0';`
`1121`	`1121`	`return (&attribute[0]);`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`	`1124`	`staticvoid`
`1125`		`-CopyAttributeOut(FILEfp,charstring,char*delim)`
	`1125`	`+CopyAttributeOut(FILEfp,charstring,char*delim,intis_array)`
`1126`	`1126`	`{`
`1127`	`1127`	`charc;`
`1128`		`-intis_array= false;`
`1129`		`-intlen=strlen(string);`
`1130`		`-`
`1131`		`-/* XXX - This is a kludge, we should check the data type */`
`1132`		`-if (len&& (string[0]=='{')&& (string[len-1]=='}'))`
`1133`		`-is_array= true;`
`1134`	`1128`
`1135`	`1129`	`for (; (c=*string)!='\0';string++)`
`1136`	`1130`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5fdefbc

File tree

1 file changed

1 file changed

`‎src/backend/commands/copy.c`

0 commit comments