Revert "bpo-34977: Add Windows App Store package (GH-10245)"#11019
Merged
vstinner merged 1 commit intopython:masterfrom Dec 7, 2018
vstinner:revert_appstore
Merged
Revert "bpo-34977: Add Windows App Store package (GH-10245)"#11019vstinner merged 1 commit intopython:masterfrom vstinner:revert_appstore
vstinner merged 1 commit intopython:masterfrom
vstinner:revert_appstore
Conversation
Member
Author
|
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'", |
Member
|
That's weird. This commit I made to test the revert was clean (no conflicts): I think I applied to the latest master, but I could be wrong. |
pablogsal
approved these changes
Dec 7, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reverts commit 468a15a.
https://bugs.python.org/issue34977