[aravis] gv_device: return NULL if genicam data load fails



commit edc3c935e0ec91c4306da250b5995a8cb480f04c
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Wed Jun 4 17:54:53 2014 +0200

    gv_device: return NULL if genicam data load fails

 src/arvgvdevice.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/arvgvdevice.c b/src/arvgvdevice.c
index 39667f5..775209d 100644
--- a/src/arvgvdevice.c
+++ b/src/arvgvdevice.c
@@ -921,6 +921,12 @@ arv_gv_device_new (GInetAddress *interface_address, GInetAddress *device_address
 
        arv_gv_device_load_genicam (gv_device);
 
+       if (!ARV_IS_GC (gv_device->priv->genicam)) {
+               arv_warning_device ("[GvDevice::new] Failed to load genicam data");
+               g_object_unref (gv_device);
+               return NULL;
+       }
+
        arv_gv_device_take_control (gv_device);
 
        heartbeat_data = g_new (ArvGvDeviceHeartbeatData, 1);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]