X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=5a68c8df4e142081c704cd56771efdadc51bc66b;hb=f227338297de002d8a76dc5e411dde8743751028;hp=6cf803dd3958f348e3985270707919256f3c209e;hpb=fe7b8efc6b36aa707365f1d23c645303a5f2307a;p=libsigrok.git

diff --git a/src/session.c b/src/session.c
index 6cf803dd..5a68c8df 100644
--- a/src/session.c
+++ b/src/session.c
@@ -256,6 +256,8 @@ SR_API int sr_session_destroy(struct sr_session *session)
 	sr_session_dev_remove_all(session);
 	g_slist_free_full(session->owned_devs, (GDestroyNotify)sr_dev_inst_free);
 
+	sr_session_datafeed_callback_remove_all(session);
+
 	g_hash_table_unref(session->event_sources);
 
 	g_mutex_clear(&session->main_mutex);
@@ -1523,7 +1525,7 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		break;
 	case SR_DF_LOGIC:
 		logic = packet->payload;
-		logic_copy = g_malloc(sizeof(logic));
+		logic_copy = g_malloc(sizeof(*logic_copy));
 		logic_copy->length = logic->length;
 		logic_copy->unitsize = logic->unitsize;
 		memcpy(logic_copy->data, logic->data, logic->length * logic->unitsize);
@@ -1531,7 +1533,7 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		break;
 	case SR_DF_ANALOG_OLD:
 		analog_old = packet->payload;
-		analog_old_copy = g_malloc(sizeof(analog_old));
+		analog_old_copy = g_malloc(sizeof(*analog_old_copy));
 		analog_old_copy->channels = g_slist_copy(analog_old->channels);
 		analog_old_copy->num_samples = analog_old->num_samples;
 		analog_old_copy->mq = analog_old->mq;
@@ -1544,7 +1546,7 @@ SR_PRIV int sr_packet_copy(const struct sr_datafeed_packet *packet,
 		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
-		analog_copy = g_malloc(sizeof(analog));
+		analog_copy = g_malloc(sizeof(*analog_copy));
 		analog_copy->data = g_malloc(
 				analog->encoding->unitsize * analog->num_samples);
 		memcpy(analog_copy->data, analog->data,