hameg-hmo: fix several compiler warnings (assignments, memory)

[libsigrok.git] / src / hardware / hameg-hmo / protocol.c

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 02fb4d5c8846154e4742aa7c3474f7589b08bdd5..e79901caaf37ee447f53119ae87d759005b14543 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -687,9 +687,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++) {