NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc444472

committed

Fix backslash-escaping multibyte chars in COPY FROM.

If a multi-byte character is escaped with a backslash in TEXT mode input,and the encoding is one of the client-only encodings where the bytes afterthe first one can have an ASCII byte "embedded" in the char, we didn'tskip the character correctly. After a backslash, we only skipped the firstbyte of the next character, so if it was a multi-byte character, we wouldtry to process its second byte as if it was a separate character. If itwas one of the characters with special meaning, like '\n', '\r', oranother '\\', that would cause trouble.One such exmple is the byte sequence '\x5ca45c2e666f6f' in Big5 encoding.That's supposed to be [backslash][two-byte character][.][f][o][o], butbecause the second byte of the two-byte character is 0x5c, we incorrectlytreat it as another backslash. And because the next character is a dot, weparse it as end-of-copy marker, and throw an "end-of-copy marker corrupt"error.Backpatch to all supported versions.Reviewed-by: John Naylor, Kyotaro HoriguchiDiscussion:https://www.postgresql.org/message-id/a897f84f-8dca-8798-3139-07da5bb38728%40iki.fi

1 parent5e7fa18 commitc444472Copy full SHA for c444472

File tree

1 file changed

-1

lines changed

src/backend/commands
- copyfromparse.c

1 file changed

-1

lines changed

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

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ CopyReadLineText(CopyFromState cstate)`
`1084`	`1084`	`break;`
`1085`	`1085`	`}`
`1086`	`1086`	`elseif (!cstate->opts.csv_mode)`
`1087`		`-`
	`1087`	`+{`
`1088`	`1088`	`/*`
`1089`	`1089`	`* If we are here, it means we found a backslash followed by`
`1090`	`1090`	`* something other than a period. In non-CSV mode, anything`
`@@ -1095,8 +1095,16 @@ CopyReadLineText(CopyFromState cstate)`
`1095`	`1095`	`* backslashes are not special, so we want to process the`
`1096`	`1096`	`* character after the backslash just like a normal character,`
`1097`	`1097`	`* so we don't increment in those cases.`
	`1098`	`+ *`
	`1099`	`+ * Set 'c' to skip whole character correctly in multi-byte`
	`1100`	`+ * encodings. If we don't have the whole character in the`
	`1101`	`+ * buffer yet, we might loop back to process it, after all,`
	`1102`	`+ * but that's OK because multi-byte characters cannot have any`
	`1103`	`+ * special meaning.`
`1098`	`1104`	`*/`
`1099`	`1105`	`raw_buf_ptr++;`
	`1106`	`+c=c2;`
	`1107`	`+}`
`1100`	`1108`	`}`
`1101`	`1109`
`1102`	`1110`	`/*`

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!

Commitc444472

File tree

1 file changed

1 file changed

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

0 commit comments