Fix possible crashes when loading outdated project file

MKleusberg · MKleusberg · commit 31ded8a8d99c · 2020-05-06T15:11:05.000+02:00
Fix a couple of possible crashed when loading a project file which does not match the database schema anymore. See issue #2232.
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -785,7 +785,10 @@ void TableBrowser::applySettings(const BrowseDataTableSettings& storedData, bool
 
     // Column widths
     for(auto widthIt=storedData.columnWidths.constBegin();widthIt!=storedData.columnWidths.constEnd();++widthIt)
-        ui->dataTable->setColumnWidth(widthIt.key(), widthIt.value());
+    {
+        if(widthIt.key() < ui->dataTable->model()->columnCount())
+            ui->dataTable->setColumnWidth(widthIt.key(), widthIt.value());
+    }
     m_columnsResized = true;
 
     // Filters
@@ -963,6 +966,9 @@ void TableBrowser::hideColumns(int column, bool hide)
     // (Un)hide requested column(s)
     for(int col : columns)
     {
+        if(col >= ui->dataTable->model()->columnCount())
+            continue;
+
         ui->dataTable->setColumnHidden(col, hide);
         if(!hide)
             ui->dataTable->setColumnWidth(col, ui->dataTable->horizontalHeader()->defaultSectionSize());
diff --git a/src/sql/Query.cpp b/src/sql/Query.cpp
@@ -25,6 +25,9 @@ std::string Query::buildWherePart() const
     {
         for(auto i=m_where.cbegin();i!=m_where.cend();++i)
         {
+            if(i->first >= m_column_names.size())
+                continue;
+
             const auto it = findSelectedColumnByName(m_column_names.at(i->first));
             std::string column = sqlb::escapeIdentifier(m_column_names.at(i->first));
             if(it != m_selected_columns.cend() && it->selector != column)

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ std::string Query::buildWherePart() const`
`25`	`25`	`{`
`26`	`26`	`for(auto i=m_where.cbegin();i!=m_where.cend();++i)`
`27`	`27`	`{`
	`28`	`+ if(i->first >= m_column_names.size())`
	`29`	`+ continue;`
	`30`	`+`
`28`	`31`	`const auto it = findSelectedColumnByName(m_column_names.at(i->first));`
`29`	`32`	`std::string column = sqlb::escapeIdentifier(m_column_names.at(i->first));`
`30`	`33`	`if(it != m_selected_columns.cend() && it->selector != column)`