fixed problematic self deletion without having the GIL and while iterating the loop

florianlink · florianlink · commit e185fc30abfb · 2018-09-24T12:09:40.000Z
diff --git a/src/PythonQtSignalReceiver.cpp b/src/PythonQtSignalReceiver.cpp
@@ -265,20 +265,24 @@ int PythonQtSignalReceiver::qt_metacall(QMetaObject::Call c, int id, void **argu
     QObject::qt_metacall(c, id, arguments);
   }
 
-  Q_FOREACH(const PythonQtSignalTarget& t, _targets) {
+  bool shouldDelete = false;
+  for(const PythonQtSignalTarget& t : _targets) {
     if (t.slotId() == id) {
       t.call(arguments);
       // if the signal is the last destroyed signal, we delete ourselves
       int sigId = t.signalId();
       if ((sigId == _destroyedSignal1Id) || (sigId == _destroyedSignal2Id)) {
         _destroyedSignalCount--;
         if (_destroyedSignalCount == 0) {
-          delete this;
+          shouldDelete = true;
         }
       }
       break;
     }
   }
+  if (shouldDelete) {
+    delete this;
+  }
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -265,20 +265,24 @@ int PythonQtSignalReceiver::qt_metacall(QMetaObject::Call c, int id, void **argu`
`265`	`265`	`QObject::qt_metacall(c, id, arguments);`
`266`	`266`	`}`
`267`	`267`
`268`		`- Q_FOREACH(const PythonQtSignalTarget& t, _targets) {`
	`268`	`+ bool shouldDelete = false;`
	`269`	`+ for(const PythonQtSignalTarget& t : _targets) {`
`269`	`270`	`if (t.slotId() == id) {`
`270`	`271`	`t.call(arguments);`
`271`	`272`	`// if the signal is the last destroyed signal, we delete ourselves`
`272`	`273`	`int sigId = t.signalId();`
`273`	`274`	`if ((sigId == _destroyedSignal1Id) \|\| (sigId == _destroyedSignal2Id)) {`
`274`	`275`	`_destroyedSignalCount--;`
`275`	`276`	`if (_destroyedSignalCount == 0) {`
`276`		`- delete this;`
	`277`	`+ shouldDelete = true;`
`277`	`278`	`}`
`278`	`279`	`}`
`279`	`280`	`break;`
`280`	`281`	`}`
`281`	`282`	`}`
	`283`	`+ if (shouldDelete) {`
	`284`	`+ delete this;`
	`285`	`+ }`
`282`	`286`	`return 0;`
`283`	`287`	`}`
`284`	`288`