Skip to content

Revert "bpo-34977: Add Windows App Store package (GH-10245)"#11019

Merged
vstinner merged 1 commit intopython:masterfrom
vstinner:revert_appstore
Dec 7, 2018
Merged

Revert "bpo-34977: Add Windows App Store package (GH-10245)"#11019
vstinner merged 1 commit intopython:masterfrom
vstinner:revert_appstore

Conversation

@vstinner
Copy link
Member

@vstinner vstinner commented Dec 7, 2018

@vstinner
Copy link
Member Author

vstinner commented Dec 7, 2018

FYI I had to fix a conflict in PC/launcher.c:

commit 4c49da0cb7434c676d70b9ccf38aca82ac0d64a9 (upstream/master, master)
Author: Zackery Spytz <zspytz@gmail.com>
Date:   Fri Dec 7 03:11:30 2018 -0700

    [bpo-35436](https://bugs.python.org/issue35436): Add missing PyErr_NoMemory() calls and other minor bug fixes. (GH-11015)
    
    Set MemoryError when appropriate, add missing failure checks,
    and fix some potential leaks.

diff --git a/PC/launcher.c b/PC/launcher.c
index 0242f26391..4c620dab7c 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1763,6 +1763,9 @@ process(int argc, wchar_t ** argv)
         }
         cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 1 + 1; /* include sep and null */
         executable = (wchar_t *)malloc(cch * sizeof(wchar_t));
+        if (executable == NULL) {
+            error(RC_NO_MEMORY, L"A memory allocation failed");
+        }
         cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, executable, cch);
         if (!cch_actual) {
             error(RC_BAD_VENV_CFG, L"Cannot decode home path in '%ls'",

@pablogsal
Copy link
Member

That's weird. This commit I made to test the revert was clean (no conflicts):

0883862

I think I applied to the latest master, but I could be wrong.

@vstinner vstinner merged commit cb0b78a into python:master Dec 7, 2018
@vstinner vstinner deleted the revert_appstore branch December 7, 2018 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants