[3.6] bpo-29854 Backport for 3.6#2633
Merged
Merged
Conversation
If history-length is set in .inputrc, and the history file is double the history size (or more), history_get(N) returns NULL, and python segfaults. Fix that by checking for NULL return value. It seems that the root cause is incorrect handling of bigger history in readline, but Python should not segfault even if readline returns unexpected value. This issue affects only GNU readline. When using libedit emulation system history size option does not work.
Member
|
Yes, this is the correct way to backport multiple PRs that are related to the same issue. I think we can skip backporting 6618e1fc8e2f06a13407c26b47a29b4777f845b5 for now. It was mainly merged to debug the test failure that we already fixed in 76dde7df682a7753e3e5ae38b2c9da872c3dfae2. |
Member
|
I added [3.6] to the title :) |
Turns out that history-size was added in readline 6.0. This explain why this tests fail on FreeBSD when using readline 5.2. We skip now the history size if readline does not support it. See https://cnswww.cns.cwru.edu/php/chet/readline/CHANGES for details.
Contributor
Author
|
Changes in version 2:
Thanks for fixing the title @Mariatta. |
Member
|
Thanks, @nirs! |
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
4 participants
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.
Backport the related patches for this bug to 3.6.
@berkerpeksag, @Haypo this will merge the related patches into one patch in 3.6, is this the way we backport patches?