[Python-checkins] cpython (merge 3.5 -> default): Fixes #25844: Merged fix from 3.5.

Sun Dec 13 04:45:28 EST 2015

https://hg.python.org/cpython/rev/cdf8033d8820
changeset: 99545:cdf8033d8820
parent: 99542:93538e7d6ed8
parent: 99544:9552fcd303fd
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Sun Dec 13 09:45:19 2015 +0000
summary:
 Fixes #25844: Merged fix from 3.5.
files:
 PC/launcher.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/PC/launcher.c b/PC/launcher.c
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -114,7 +114,7 @@
 if (result >= BUFSIZE) {
 /* Large environment variable. Accept some leakage */
 wchar_t *buf2 = (wchar_t*)malloc(sizeof(wchar_t) * (result+1));
- if (buf2 = NULL) {
+ if (buf2 == NULL) {
 error(RC_NO_MEMORY, L"Could not allocate environment buffer");
 }
 GetEnvironmentVariableW(key, buf2, result);
-- 
Repository URL: https://hg.python.org/cpython
