Scintilla 5.1.5 aftermath #3098
Merged
Conversation
This file contains 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
This commit fixes a few problems introduced by the last Scintilla update. That update caused some headache around the incompatible changes to `SCI_GETTEXT`, `SCI_GETSELTEXT`, and `SCI_GETCURLINE`. - An explicit NUL termination was added to `sci_get_text()`. This is both superflous and wrong (it writes behind the allocated buffer) as SCI_GETTEXT already does NUL termination. - In `sci_get_contents()`, sci_get_string() cannot be used. That would call SCI_GETTEXT with length == 0 which is not the desired outcome. Instead, basically revert to the old implementation but account for the API change. - The callers of sci_get_selected_text_length() must be adapted, this was missing yet. sci_get_selected_text_length() return value does not include the NUL termination anymore. Resolves geany#3095 Fixes: d7c985e ("Adapt to SCI_GETTEXT changes")
|
Just went through the patch and looks good to me. This should be basically all needed for Geany itself. |
|
Thanks. I'll merge quickly as it resolves pretty severe issue. |
Pity. What a pleasant change to see that Geany is capable of crashing ;-). |
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 commit fixes a few problems introduced by the last Scintilla update.
That update caused some headache around the incompatible changes to
SCI_GETTEXT,SCI_GETSELTEXT, andSCI_GETCURLINE.An explicit NUL termination was added to
sci_get_text(). This is bothsuperflous and wrong (it writes behind the allocated buffer) as SCI_GETTEXT
already does NUL termination.
In
sci_get_contents(), sci_get_string() cannot be used. That would callSCI_GETTEXT with length == 0 which is not the desired outcome. Instead,
basically revert to the old implementation but account for the API change.
The callers of sci_get_selected_text_length() must be adapted, this
was missing yet. sci_get_selected_text_length() return value does not
include the NUL termination anymore.
Resolves #3095
Fixes: d7c985e ("Adapt to SCI_GETTEXT changes")