Fix a segfault in iterator of a ConfigParser section #1682
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
|
FWIW I tried to research a better way to return |
hroncok
commented
Dec 8, 2024
| @@ -71,10 +71,6 @@ template<class T> | |||
| class Iterator { | |||
There was a problem hiding this comment.
Side note: I am not entirely sure why this class exists in this file as well.
An iterator should return self on __iter__.
So that this works:
>>> it1 = iter(sectObj)
>>> it2 = iter(it1)
>>> it1 is it2
True
Previously, this iterator did not return self on __iter__, it was like this:
class PreserveOrderMapStringStringIterator(object):
...
def __iter__(self):
return _common_types.PreserveOrderMapStringStringIterator___iter__(self)
And that returned a new Python object.
This fixes https://bugzilla.redhat.com/2330562 by avoiding a second iterator object.
My SWIG skills are close to zero,
perhaps this is not the best way to return self, but it seems to work.
|
dnf5 has the entire Iterator written in Python which might be a possible solution as well: https://github.com/rpm-software-management/dnf5/blob/ff1ac05c43a4fbf022aedaeef9b6ba49a47a4e1f/bindings/libdnf5/common.i#L104C7-L104C15 |
m-blaha
merged commit f3302a8
into
rpm-software-management:dnf-4-master
6 of 9 checks passed
jan-kolarik
added a commit
to rpm-software-management/dnf
that referenced
this pull request
Dec 10, 2024
This is a follow-up to rpm-software-management/libdnf#1682. Reported bug: https://bugzilla.redhat.com/show_bug.cgi?id=2330562
jan-kolarik
added a commit
to rpm-software-management/dnf
that referenced
this pull request
Dec 10, 2024
This is a follow-up to rpm-software-management/libdnf#1682. Reported bug: https://bugzilla.redhat.com/show_bug.cgi?id=2330562
jan-kolarik
added a commit
to rpm-software-management/dnf
that referenced
this pull request
Dec 10, 2024
This is a follow-up to rpm-software-management/libdnf#1682. Reported bug: https://bugzilla.redhat.com/show_bug.cgi?id=2330562
jan-kolarik
added a commit
to rpm-software-management/dnf
that referenced
this pull request
Dec 10, 2024
This is a follow-up to rpm-software-management/libdnf#1682. Reported bug: https://bugzilla.redhat.com/show_bug.cgi?id=2330562
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.
An iterator should return self on
__iter__.So that this works:
Previously, this iterator did not return self on
__iter__, it was like this:And that returned a new Python object.
This fixes https://bugzilla.redhat.com/2330562 by avoiding a second iterator object.
My SWIG skills are close to zero,
perhaps this is not the best way to return self, but it seems to work.