swq_select::expand_wildcard(): avoid unsigned integer overflow, and c…

…overity warning about loop taken once
OSGeo · Mar 12, 2024 · c24b95c · c24b95c
1 parent a8846d1
commit c24b95c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ogr/swq_select.cpp b/ogr/swq_select.cpp
@@ -866,13 +866,14 @@ CPLErr swq_select::expand_wildcard(swq_field_list *field_list,
         column_defs.insert(pos, expanded_columns.begin(),
                            expanded_columns.end());
 
-        columns_added += static_cast<int>(expanded_columns.size() - 1);
+        columns_added += static_cast<int>(expanded_columns.size()) - 1;
 
-        auto it = m_exclude_fields.find(isrc);
+        const auto it = m_exclude_fields.find(isrc);
         if (it != m_exclude_fields.end())
         {
-            for (const auto &field : it->second)
+            if (!it->second.empty())
             {
+                const auto &field = it->second.front();
                 CPLError(
                     CE_Failure, CPLE_AppDefined,
                     "Field %s specified in EXCEPT/EXCLUDE expression not found",