[Python-checkins] cpython (3.4): Fixes #25844: Corrected =/== typo potentially leading to crash in launcher.

Sun Dec 13 04:45:28 EST 2015

https://hg.python.org/cpython/rev/5015440beec2
changeset: 99543:5015440beec2
branch: 3.4
parent: 99529:646bf7f5f019
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Sun Dec 13 09:41:29 2015 +0000
summary:
 Fixes #25844: Corrected =/== typo potentially leading to crash in launcher.
files:
 PC/launcher.c | 4 ++--
 1 files changed, 2 insertions(+), 2 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);
@@ -1219,7 +1219,7 @@
 * is no version specification.
 */
 debug(L"searching PATH for python executable\n");
- cmd = find_on_path(L"python");
+ cmd = find_on_path(PYTHON_EXECUTABLE);
 debug(L"Python on path: %s\n", cmd ? cmd->value : L"<not found>");
 if (cmd) {
 debug(L"located python on PATH: %s\n", cmd->value);
-- 
Repository URL: https://hg.python.org/cpython
