]> sigrok.org Git - libsigrok.git/commitdiff
lcr/es51919: clean but don't free dev context in cleanup callback
authorGerhard Sittig <redacted>
Fri, 18 Aug 2017 18:07:23 +0000 (20:07 +0200)
committerUwe Hermann <redacted>
Sat, 19 Aug 2017 17:21:51 +0000 (19:21 +0200)
The es51919_serial_clean() routine is called by std_dev_clear_with_callback().
Common code unconditionally frees the 'priv' part. The cleanup callback only
shall release descending resources which are local to the callee and opaque
to the caller.

This fixes a double free error. Tested with PeakTech 2170.

  $ sigrok-cli -d peaktech-2170:conn=/dev/ttyUSB0 --show

src/lcr/es51919.c

index 9030a4ba7d2c055285d406b113135eef1bd03919..715c25cdbb778ddce81d8758955821482462ff23 100644 (file)
@@ -726,7 +726,6 @@ SR_PRIV void es51919_serial_clean(void *priv)
                return;
 
        dev_buffer_destroy(devc->buf);
-       g_free(devc);
 }
 
 SR_PRIV struct sr_dev_inst *es51919_serial_scan(GSList *options,