NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit54549d8

committed

> I found a problem with PQescapeString (I think). Since it escapes

> null bytes to be literally '\0', the following can happen:> 1. User inputs string value as "<null byte>##" where ## are digits in the> range of 0 to 7.> 2. PQescapeString converts this to "\0##"> 3. Escaped string is used in a context that causes "\0##" to be evaluated as> an octal escape sequence.I agree that this is a problem, though it is not possible to doanything harmful with it. In addition, it only occurs if there areany NUL characters in its input, which is very unlikely if you areusing C strings.The patch below addresses the issue by removing escaping of \0characters entirely.> If the goal is to "safely" encode null bytes, and preserve the rest of the> string as it was entered, I think the null bytes should be escaped as \\000> (note that if you simply use \000 the same string truncation problem> occurs).We can't do that, this would require 4n + 1 bytes of storage for theresult, breaking the interface.Florian Weimer

1 parent351a0c1 commit54549d8Copy full SHA for 54549d8

File tree

2 files changed

-10

lines changed

src/interfaces
- jdbc/org/postgresql/jdbc2
  - ResultSet.java
- libpq
  - fe-exec.c

2 files changed

-10

lines changed

`‎src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1396,7 +1396,7 @@ public static boolean toBoolean(String s)`
`1396`	`1396`	`if (s !=null)`
`1397`	`1397`	`{`
`1398`	`1398`	`intc =s.charAt(0);`
`1399`		`-return ((c =='t') \|\| (c =='T'));`
	`1399`	`+return ((c =='t') \|\| (c =='T') \|\| (c =='1'));`
`1400`	`1400`	`}`
`1401`	`1401`	`returnfalse;// SQL NULL`
`1402`	`1402`	`}`

`‎src/interfaces/libpq/fe-exec.c`

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.110 2001/09/07 22:02:32 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.111 2001/09/13 17:00:34 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -59,7 +59,7 @@ static intgetNotice(PGconn *conn);`
`59`	`59`	`/* ---------------`
`60`	`60`	`* Escaping arbitrary strings to get valid SQL strings/identifiers.`
`61`	`61`	`*`
`62`		`- * Replaces "\\" with "\\\\", "\0" with "\\0", and "'" with "''".`
	`62`	`+ * Replaces "\\" with "\\\\" and "'" with "''".`
`63`	`63`	`* length is the length of the buffer pointed to by`
`64`	`64`	`* from. The buffer at to must be at least 2*length + 1 characters`
`65`	`65`	`* long. A terminating NUL character is written.`
`@@ -75,13 +75,6 @@ PQescapeString (char to, const char from, size_t length)`
`75`	`75`
`76`	`76`	`while (remaining>0) {`
`77`	`77`	`switch (*source) {`
`78`		`-case'\0':`
`79`		`-*target='\\';`
`80`		`-target++;`
`81`		`-*target='0';`
`82`		`-/* target and remaining are updated below. */`
`83`		`-break;`
`84`		`-`
`85`	`78`	`case'\\':`
`86`	`79`	`*target='\\';`
`87`	`80`	`target++;`

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!

Commit54549d8

File tree

2 files changed

2 files changed

`‎src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java`

`‎src/interfaces/libpq/fe-exec.c`

0 commit comments