device: error if R[address] has no value in set_features_from_string

Author: EmmanuelP

src/arvdevice.c

@@ -1182,14 +1182,22 @@ arv_device_set_features_from_string (ArvDevice *device, const char *string, GErr
                                                      ARV_DEVICE_ERROR_INVALID_PARAMETER,
                                                      "Invalid address in %s", key);
                                 } else {
-                                        int_value = g_ascii_strtoll (value, &end, 0);
-                                        if (end == NULL || end[0] != '\0') {
+                                        if (value == NULL || strlen (value) == 0) {
                                                 g_set_error (&local_error,
                                                              ARV_DEVICE_ERROR,
                                                              ARV_DEVICE_ERROR_INVALID_PARAMETER,
-                                                             "Invalid %s value for %s", value, key);
+                                                             "Value not found for %s", key);
                                         } else {
-                                                arv_device_write_register (device, address, int_value, &local_error);
+                                                int_value = g_ascii_strtoll (value, &end, 0);
+                                                if (end == NULL || end[0] != '\0') {
+                                                        g_set_error (&local_error,
+                                                                     ARV_DEVICE_ERROR,
+                                                                     ARV_DEVICE_ERROR_INVALID_PARAMETER,
+                                                                     "Invalid %s value for %s", value, key);
+                                                } else {
+                                                        arv_device_write_register (device, address, int_value,
+                                                                                   &local_error);
+                                                }
                                         }
                                 }
                         } else {

tests/fake.c

@@ -723,6 +723,18 @@ set_features_from_string_test (void)
 	g_assert (success);
 	g_assert (error == NULL);
 
+	success = arv_device_set_features_from_string (device, "R[0x1f0]", &error);
+	g_assert (!success);
+	g_assert (error != NULL);
+	g_clear_error (&error);
+
+	success = arv_device_set_features_from_string (device, "R[0x1f0]=10", &error);
+	g_assert (success);
+	g_assert (error == NULL);
+        int_value = arv_device_get_integer_feature_value (device, "TestRegister", &error);
+	g_assert (error == NULL);
+        g_assert_cmpint(int_value, ==, 10);
+
 	success = arv_device_set_features_from_string (device, NULL, NULL);
 	g_assert (success);