Fix crash when removing the only index constraint from a table

MKleusberg · MKleusberg · commit a5a3d7fd199e · 2022-12-25T16:11:40.000+01:00
This fixes a possible endless loop when using the Edit Table dialog and removing the only index constraint (i.e. primary key and unique constraints) from the table. See issue #3245.
diff --git a/src/sql/sqlitetypes.cpp b/src/sql/sqlitetypes.cpp
@@ -485,6 +485,10 @@ void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint
                 m_indexConstraints.insert(std::make_pair(new_columns, it->second));
                 it = m_indexConstraints.erase(it);
             }
+
+            // If container is empty now, return here instead of advancing the iterator
+            if(m_indexConstraints.empty())
+                return;
         }
     }
 }
@@ -507,6 +511,10 @@ void Table::removeKeyFromAllConstraints(const std::string& key)
                 container.insert(std::make_pair(new_columns, it->second));
                 it = container.erase(it);
             }
+
+            // If container is empty now, return here instead of advancing the iterator
+            if(container.empty())
+                return;
         }
     };
 

Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,10 @@ void Table::removeKeyFromConstraint(std::shared_ptr<UniqueConstraint> constraint`
`485`	`485`	`m_indexConstraints.insert(std::make_pair(new_columns, it->second));`
`486`	`486`	`it = m_indexConstraints.erase(it);`
`487`	`487`	`}`
	`488`	`+`
	`489`	`+ // If container is empty now, return here instead of advancing the iterator`
	`490`	`+ if(m_indexConstraints.empty())`
	`491`	`+ return;`
`488`	`492`	`}`
`489`	`493`	`}`
`490`	`494`	`}`
`@@ -507,6 +511,10 @@ void Table::removeKeyFromAllConstraints(const std::string& key)`
`507`	`511`	`container.insert(std::make_pair(new_columns, it->second));`
`508`	`512`	`it = container.erase(it);`
`509`	`513`	`}`
	`514`	`+`
	`515`	`+ // If container is empty now, return here instead of advancing the iterator`
	`516`	`+ if(container.empty())`
	`517`	`+ return;`
`510`	`518`	`}`
`511`	`519`	`};`
`512`	`520`