Commit5735efe

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 parente49ad77 commit5735efeCopy full SHA for 5735efe

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1668,10 +1668,14 @@ write_console(const char *line, int len)`
`1668`	`1668`	`/*`
`1669`	`1669`	`* WriteConsoleW() will fail of stdout is redirected, so just fall through`
`1670`	`1670`	`* to writing unconverted to the logfile in this case.`
	`1671`	`+ *`
	`1672`	`+ * Since we palloc the structure required for conversion, also fall through`
	`1673`	`+ * to writing unconverted if we have not yet set up CurrentMemoryContext.`
`1671`	`1674`	`*/`
`1672`	`1675`	`if (GetDatabaseEncoding()!=GetPlatformEncoding()&&`
`1673`	`1676`	`!in_error_recursion_trouble()&&`
`1674`		`-!redirection_done)`
	`1677`	`+!redirection_done&&`
	`1678`	`+CurrentMemoryContext!=NULL)`
`1675`	`1679`	`{`
`1676`	`1680`	`WCHAR*utf16;`
`1677`	`1681`	`intutf16len;`

Comments

(0)