Merge branch 'main' into flake8-dbmgr

OSGeo · Sep 26, 2024 · f04ef69 · f04ef69
2 parents 2ff8e85 + 845dfd0
commit f04ef69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/gui/wxpython/dbmgr/dialogs.py b/gui/wxpython/dbmgr/dialogs.py
@@ -222,10 +222,11 @@ def GetSQLString(self, updateValues=False):
                     ctype = columns[name]["ctype"]
                     value = columns[name]["values"][idx]
                     id = columns[name]["ids"][idx]
+                    widget = self.FindWindowById(id)
                     try:
-                        newvalue = self.FindWindowById(id).GetValue()
-                    except:
-                        newvalue = self.FindWindowById(id).GetLabel()
+                        newvalue = widget.GetValue()
+                    except AttributeError:
+                        newvalue = widget.GetLabel()
 
                     if newvalue:
                         try:

diff --git a/vector/v.vol.rst/user1.c b/vector/v.vol.rst/user1.c
@@ -220,6 +220,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql)
             if (a < 0) {
                 G_warning(_("Can't insert %lf,%lf,%lf,%lf,%lf a=%d"), x, y, z,
                           w, sm, a);
+                Vect_destroy_field_info(Fi);
                 return -1;
             }
 
@@ -322,6 +323,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql)
         }
         else {
             fprintf(stderr, "ERROR: zero points in the given region!\n");
+            Vect_destroy_field_info(Fi);
             return -1;
         }
     }
@@ -332,6 +334,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql)
                 KMIN, KMAX);
         fprintf(stderr, "for smooth connection of segments, npmin > segmax "
                         "(see manual) \n");
+        Vect_destroy_field_info(Fi);
         return -1;
     }
 
@@ -382,6 +385,7 @@ int INPUT(struct Map_info *In, char *column, char *scol, char *wheresql)
         }
         G_message(_("Bitmap mask created"));
     }
+    Vect_destroy_field_info(Fi);
 
     return 1;
 }