fix a segfault in iterator of a ConfigParser section

Origin: https://github.com/rpm-software-management/libdnf/commit/f3302a865b230e021e9defbcea978ed1290a9b2f
Forwarded: https://github.com/rpm-software-management/libdnf/pull/1682

Gbp-Pq: Name 0015-fix-segfault.patch

diff --git a/bindings/swig/common_types.i b/bindings/swig/common_types.i
index c9ae798a15d4647ab69615b63f93bd1b6e62ff92..a1f90d9e5095dbb6a4a457c6a8a7c68af7a2b638 100644 (file)
--- a/bindings/swig/common_types.i
+++ b/bindings/swig/common_types.i
@@ -63,10 +63,6 @@ template<class T>
 class Iterator {
 public:
     Iterator(typename T::iterator _cur, typename T::iterator _end) : cur(_cur), end(_end) {}
-    Iterator* __iter__()
-    {
-      return this;
-    }
 
     typename T::iterator cur;
     typename T::iterator end;
@@ -165,3 +161,10 @@ EXTEND_TEMPLATE_PreserveOrderMapIterator(std::string, std::string)
 EXTEND_TEMPLATE_PreserveOrderMapIterator(std::string, libdnf::PreserveOrderMap<std::string, std::string>)
 
 %exception;  // beware this resets all exception handlers if you import this file after defining any
+
+%pythoncode %{
+def PreserveOrderMapStringStringIterator___iter__(self):
+    return self
+PreserveOrderMapStringStringIterator.__iter__ = PreserveOrderMapStringStringIterator___iter__
+del PreserveOrderMapStringStringIterator___iter__
+%}

diff --git a/bindings/swig/conf.i b/bindings/swig/conf.i
index b6a0ce88163b14f8febb71af414c0f501ff37894..2f77003fe5273c373870eafd205e284832636bd3 100644 (file)
--- a/bindings/swig/conf.i
+++ b/bindings/swig/conf.i
@@ -71,10 +71,6 @@ template<class T>
 class Iterator {
 public:
     Iterator(typename T::iterator _cur, typename T::iterator _end) : cur(_cur), end(_end) {}
-    Iterator* __iter__()
-    {
-        return this;
-    }
 
     typename T::iterator cur;
     typename T::iterator end;