Commit7b99cfb

committed

Avoid palloc before CurrentMemoryContext is set up on win32

Instead, write the unconverted output - it will be in the wrongencoding, but at least we don't crash.Rushabh Lathia

1 parenteff9335 commit7b99cfbCopy full SHA for 7b99cfb

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1658,10 +1658,14 @@ write_console(const char *line, int len)`
`1658`	`1658`	`/*`
`1659`	`1659`	`* WriteConsoleW() will fail of stdout is redirected, so just fall through`
`1660`	`1660`	`* to writing unconverted to the logfile in this case.`
	`1661`	`+ *`
	`1662`	`+ * Since we palloc the structure required for conversion, also fall through`
	`1663`	`+ * to writing unconverted if we have not yet set up CurrentMemoryContext.`
`1661`	`1664`	`*/`
`1662`	`1665`	`if (GetDatabaseEncoding()!=GetPlatformEncoding()&&`
`1663`	`1666`	`!in_error_recursion_trouble()&&`
`1664`		`-!redirection_done)`
	`1667`	`+!redirection_done&&`
	`1668`	`+CurrentMemoryContext!=NULL)`
`1665`	`1669`	`{`
`1666`	`1670`	`WCHAR*utf16;`
`1667`	`1671`	`intutf16len;`

Comments

(0)