X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=device.c;h=0cc5e55256978230eb565aa879ad22b74d31ff2e;hb=c0a4b9716d32811d9b2320884d3bd0e599feedcf;hp=aa1ec7828a36e5228094b2ad0c13a2edfe09b093;hpb=f437ea3fe2cada77634eb3a06d34abf680b9c092;p=libsigrok.git

diff --git a/device.c b/device.c
index aa1ec782..0cc5e552 100644
--- a/device.c
+++ b/device.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
 extern struct sr_global *global;
 
@@ -48,7 +49,7 @@ int sr_device_plugin_init(struct sr_device_plugin *plugin)
 {
 	int num_devices, num_probes, i;
 
-	g_message("initializing %s plugin", plugin->name);
+	sr_info("initializing %s plugin", plugin->name);
 	num_devices = plugin->init(NULL);
 	for (i = 0; i < num_devices; i++) {
 		num_probes = (int)plugin->get_device_info(i, SR_DI_NUM_PROBES);
@@ -85,7 +86,11 @@ struct sr_device *sr_device_new(struct sr_device_plugin *plugin, int plugin_inde
 	struct sr_device *device;
 	int i;
 
-	device = g_malloc0(sizeof(struct sr_device));
+	if (!(device = g_try_malloc0(sizeof(struct sr_device)))) {
+		sr_err("dev: %s: device malloc failed", __func__);
+		return NULL;
+	}
+
 	device->plugin = plugin;
 	device->plugin_index = plugin_index;
 	devices = g_slist_append(devices, device);
@@ -153,7 +158,13 @@ void sr_device_probe_add(struct sr_device *device, const char *name)
 	int probenum;
 
 	probenum = g_slist_length(device->probes) + 1;
-	p = g_malloc0(sizeof(struct sr_probe));
+
+	if (!(p = g_try_malloc0(sizeof(struct sr_probe)))) {
+		sr_err("dev: %s: p malloc failed", __func__);
+		// return SR_ERR_MALLOC;
+		return; /* FIXME: should return int. */
+	}
+
 	p->index = probenum;
 	p->enabled = TRUE;
 	if (name) {