From 0a24458308d9b703ca16c73d7a31fcaf5de96ea9 Mon Sep 17 00:00:00 2001
From: Peter Fales <peter@fales-lorenz.net>
Date: Fri, 25 Oct 2002 02:16:40 +0000
Subject: [PATCH] Improve checks for invalid parameters in config file

---
 backend/gphoto2.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/backend/gphoto2.c b/backend/gphoto2.c
index 7d9c2fd69..e2126542b 100644
--- a/backend/gphoto2.c
+++ b/backend/gphoto2.c
@@ -419,12 +419,28 @@ init_gphoto2 (void)
 
   if (strcmp (Cam_data.port, "Browse") != 0)
     {
-      port = gp_port_info_list_lookup_path (il, Cam_data.port);
+      CHECK_RET (port = gp_port_info_list_lookup_path (il, Cam_data.port));
       CHECK_RET (gp_port_info_list_get_info (il, port, &info));
       CHECK_RET (gp_camera_set_port_info (camera, info));
       gp_port_info_list_free (il);
     }
 
+  for (n = 0; abilities.speed[n]; n++)
+    {
+      if (abilities.speed[n] == Cam_data.speed)
+	{
+	  break;
+	}
+    }
+
+  if (abilities.speed[n] == 0)
+    {
+      DBG (0,
+	   "%s: error: %d is not a valid speed for this camers.  Use \"gphoto2 --camera \"%s\" --abilities\" for list.\n",
+	   "init_gphoto2", Cam_data.speed, Cam_data.camera_name);
+      return SANE_STATUS_INVAL;
+    }
+
   DBG (4, "init_gphoto2: about to initialize port\n");
   /*
    * Setting of speed only makes sense for serial ports. gphoto2
@@ -473,20 +489,6 @@ init_gphoto2 (void)
       sod[GPHOTO2_OPT_ERASE].cap |= SANE_CAP_INACTIVE;
     }
 
-  for (n = 0; abilities.speed[n]; n++)
-    {
-      if (abilities.speed[n] == Cam_data.speed)
-	{
-	  break;
-	}
-      if (abilities.speed[n] == 0)
-	{
-	  DBG (0,
-	       "%s: error: %d is not a valid speed for this camers.  Use \"gphoto2 --camera \"%s\" --abilities\" for list.\n",
-	       "init_gphoto2", Cam_data.speed, Cam_data.camera_name);
-	  return SANE_STATUS_INVAL;
-	}
-    }
 
   DBG (4, "init_gphoto2: about to get folders\n");