mirror of
https://github.com/postgres/postgres.git
synced 2025-07-31 22:04:40 +03:00
Do not escape a unicode sequence when escaping JSON text.
Previously, any backslash in text being escaped for JSON was doubled so that the result was still valid JSON. However, this led to some perverse results in the case of Unicode sequences, These are now detected and the initial backslash is no longer escaped. All other backslashes are still escaped. No validity check is performed, all that is looked for is \uXXXX where X is a hexidecimal digit. This is a change from the 9.2 and 9.3 behaviour as noted in the Release notes. Per complaint from Teodor Sigaev.
This commit is contained in:
@ -2315,7 +2315,26 @@ escape_json(StringInfo buf, const char *str)
|
||||
appendStringInfoString(buf, "\\\"");
|
||||
break;
|
||||
case '\\':
|
||||
appendStringInfoString(buf, "\\\\");
|
||||
/*
|
||||
* Unicode escapes are passed through as is. There is no
|
||||
* requirement that they denote a valid character in the
|
||||
* server encoding - indeed that is a big part of their
|
||||
* usefulness.
|
||||
*
|
||||
* All we require is that they consist of \uXXXX where
|
||||
* the Xs are hexadecimal digits. It is the responsibility
|
||||
* of the caller of, say, to_json() to make sure that the
|
||||
* unicode escape is valid.
|
||||
*
|
||||
* In the case of a jsonb string value being escaped, the
|
||||
* only unicode escape that should be present is \u0000,
|
||||
* all the other unicode escapes will have been resolved.
|
||||
*/
|
||||
if (p[1] == 'u' && isxdigit(p[2]) && isxdigit(p[3])
|
||||
&& isxdigit(p[4]) && isxdigit(p[5]))
|
||||
appendStringInfoCharMacro(buf, *p);
|
||||
else
|
||||
appendStringInfoString(buf, "\\\\");
|
||||
break;
|
||||
default:
|
||||
if ((unsigned char) *p < ' ')
|
||||
|
Reference in New Issue
Block a user