X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=059ae4399cc612f241b6b5d0dff7e3e1f9ec6994;hb=d6d87fa2a28edbfa0f1c66ef4b03c9cd8bda095e;hp=02fb4d5c8846154e4742aa7c3474f7589b08bdd5;hpb=bd70ec4b7325707a8b2f2fdf5ebf097051781c7b;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 02fb4d5c..059ae439 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -664,6 +664,7 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 	unsigned int i, j, group;
 	struct sr_channel *ch;
 	struct dev_context *devc;
+	int ret;
 
 	devc = sdi->priv;
 	model_index = -1;
@@ -687,9 +688,13 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 
 	devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
 					scope_models[model_index].analog_channels);
-
 	devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
 					 scope_models[model_index].digital_pods);
+	if (!devc->analog_groups || !devc->digital_groups) {
+		g_free(devc->analog_groups);
+		g_free(devc->digital_groups);
+		return SR_ERR_MALLOC;
+	}
 
 	/* Add analog channels. */
 	for (i = 0; i < scope_models[model_index].analog_channels; i++) {
@@ -707,12 +712,19 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 	}
 
 	/* Add digital channel groups. */
+	ret = SR_OK;
 	for (i = 0; i < scope_models[model_index].digital_pods; i++) {
 		devc->digital_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
+		if (!devc->digital_groups[i]) {
+			ret = SR_ERR_MALLOC;
+			break;
+		}
 		devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
 		sdi->channel_groups = g_slist_append(sdi->channel_groups,
 				   devc->digital_groups[i]);
 	}
+	if (ret != SR_OK)
+		return ret;
 
 	/* Add digital channels. */
 	for (i = 0; i < scope_models[model_index].digital_channels; i++) {