fix: import inconsistency and possible infinite loop

Signed-off-by: Thierry Bugier <[email protected]>
pluginsGLPI · Jun 2, 2020 · 8939329 · 8939329
1 parent 74b817d
commit 8939329
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/inc/exportable.class.php b/inc/exportable.class.php
@@ -131,15 +131,17 @@ public function importChildrenObjects($item, $linker, $subItems, $input) {
 
     public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
     {
-        if ($this instanceof CommonDBChild) {
+        if ($this instanceof CommonDBRelation) {
             $keepCriteria = [
                 'itemtype' => $container->getType(),
                 'items_id' => $container->getID(),
             ];
-        } else {
+        } else if ($this instanceof CommonDBChild) {
             $keepCriteria = [
                 $container::getForeignKeyField() => $container->getID(),
             ];
+        } else {
+            return true;
         }
         if (count($exclude) > 0) {
             $keepCriteria[] = ['NOT' => ['id' => $exclude]];

diff --git a/inc/linker.class.php b/inc/linker.class.php
@@ -121,15 +121,16 @@ public function linkPostponed() {
       do {
          $postponedCount = 0;
          $postponedAgainCount = 0;
-         foreach ($this->postponed as $itemtype => $postponedItemtypeList) {
+         foreach ($this->postponed as $itemtype => &$postponedItemtypeList) {
             $postponedCount += count($postponedItemtypeList);
-            $newList = $postponedItemtypeList;
+            $newList = [];
             foreach ($postponedItemtypeList as $originalId => $postponedItem) {
                if ($itemtype::import($this, $postponedItem['input'], $postponedItem['relationId']) === false) {
                   $newList[$originalId] = $postponedItem;
                   $postponedAgainCount++;
                }
             }
+            $postponedItemtypeList = $newList;
          }
 
          // If no item was successfully imported,  then the import is in a deadlock and fails