Skip to content

bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fixes#11015

Merged
serhiy-storchaka merged 2 commits into
python:masterfrom
ZackerySpytz:bpo-35436-missing-PyErr_NoMemory-and-others
Dec 7, 2018
Merged

bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fixes#11015
serhiy-storchaka merged 2 commits into
python:masterfrom
ZackerySpytz:bpo-35436-missing-PyErr_NoMemory-and-others

Conversation

@ZackerySpytz

@ZackerySpytz ZackerySpytz commented Dec 7, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

Set MemoryError when appropriate, add missing failure checks,
and fix some potential leaks.

https://bugs.python.org/issue35436

@ZackerySpytz
bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fixes
ddf0259 
Set MemoryError when appropriate, add missing failure checks,
and fix some potential leaks.
@ZackerySpytz ZackerySpytz requested a review from a team as a code owner December 7, 2018 06:56
serhiy-storchaka
serhiy-storchaka approved these changes Dec 7, 2018
View reviewed changes

@serhiy-storchaka serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work! It is worth adding a news entry.

Comment thread Parser/myreadline.c Outdated
@serhiy-storchaka serhiy-storchaka added type-bug An unexpected behavior, bug, or error needs backport to 3.6 labels Dec 7, 2018
@ZackerySpytz
Add a news entry
9ac76bb 
Remove some useless indentation.
Add a missing check introduced in a recent commit (468a15a).
@ZackerySpytz

ZackerySpytz commented Dec 7, 2018

Copy link
Copy Markdown
Contributor Author

@serhiy-storchaka Thank you for the review.

@serhiy-storchaka serhiy-storchaka merged commit 4c49da0 into python:master Dec 7, 2018
@miss-islington

miss-islington commented Dec 7, 2018

Copy link
Copy Markdown
Contributor

Thanks @ZackerySpytz for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Dec 7, 2018

Copy link
Copy Markdown
Contributor

Sorry, @ZackerySpytz and @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4c49da0cb7434c676d70b9ccf38aca82ac0d64a9 3.7

@miss-islington

miss-islington commented Dec 7, 2018

Copy link
Copy Markdown
Contributor

Sorry, @ZackerySpytz and @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4c49da0cb7434c676d70b9ccf38aca82ac0d64a9 3.6

@miss-islington

miss-islington commented Dec 7, 2018

Copy link
Copy Markdown
Contributor

Sorry, @ZackerySpytz and @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4c49da0cb7434c676d70b9ccf38aca82ac0d64a9 2.7

@ZackerySpytz

ZackerySpytz commented Dec 7, 2018

Copy link
Copy Markdown
Contributor Author

@serhiy-storchaka I'll create the backport PRs.

vstinner added a commit that referenced this pull request Dec 7, 2018
@vstinner
Revert "bpo-35436: Add missing PyErr_NoMemory() calls and other minor…
84cf4ce 
… bug fixes. (GH-11015)"

This reverts commit 4c49da0.
ZackerySpytz added a commit to ZackerySpytz/cpython that referenced this pull request Dec 7, 2018
@ZackerySpytz
bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fix…
ec7c5af 
…es. (pythonGH-11015)

(cherry picked from commit 4c49da0)
@bedevere-bot

bedevere-bot commented Dec 7, 2018

Copy link
Copy Markdown

GH-11020 is a backport of this pull request to the 3.7 branch.

serhiy-storchaka pushed a commit that referenced this pull request Dec 7, 2018
@ZackerySpytz @serhiy-storchaka
bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fix…
602d307 
…es. (GH-11015) (GH-11020)

(cherry picked from commit 4c49da0)
@bedevere-bot

bedevere-bot commented Dec 7, 2018

Copy link
Copy Markdown

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x RHEL 3.7 has failed when building commit 602d307.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/126/builds/860) and take a look at the build logs.
  4. Check if the failure is related to this commit (602d307) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/126/builds/860

Click to see traceback logs 
fatal: unable to access 'https://github.com/python/cpython.git/': Encountered end of file

make: *** No rule to make target `distclean'.  Stop.

serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Dec 7, 2018
@ZackerySpytz @serhiy-storchaka
[3.6] bpo-35436: Add missing PyErr_NoMemory() calls and other minor b…
32847e1 
…ug fixes. (pythonGH-11015) (pythonGH-11020)

(cherry picked from commit 4c49da0).
(cherry picked from commit 602d307)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
serhiy-storchaka added a commit that referenced this pull request Dec 7, 2018
@serhiy-storchaka @ZackerySpytz
bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fix…
2d6bc25 
…es. (GH-11015) (GH-11020) (GH-11026)

(cherry picked from commit 4c49da0)
(cherry picked from commit 602d307)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
@serhiy-storchaka serhiy-storchaka removed their assignment Dec 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ZackerySpytz @miss-islington @bedevere-bot @serhiy-storchaka @the-knights-who-say-ni