BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

beaglelogic: Fix PulseView crash on close 

Use dev_clear instead of std_dev_clear to clean up our private
data structure.

Signed-off-by: Kumar Abhishek <abhishek@theembeddedkitchen.net>
This commit is contained in:
Kumar Abhishek 2017-09-23 11:21:15 +05:30 committed by Uwe Hermann
parent f7d7ee82dd
commit d6f20d0366
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hardware/beaglelogic/api.c
View File

@ -150,6 +150,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
err_free:
g_free(sdi->model);
g_free(sdi->version);
g_free(devc->address);
g_free(devc->port);
g_free(devc);
g_free(sdi);
@ -207,10 +209,24 @@ static int dev_close(struct sr_dev_inst *sdi)
devc->beaglelogic->munmap(devc);
devc->beaglelogic->close(devc);
return SR_OK;
}
static void clear_helper(struct dev_context *devc)
{
if (devc->tcp_buffer)
g_free(devc->tcp_buffer);
return SR_OK;
if (devc->address)
g_free(devc->address);
if (devc->port)
g_free(devc->port);
}
static int dev_clear(const struct sr_dev_driver *di)
{
return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
}
static int config_get(uint32_t key, GVariant **data,
@ -379,7 +395,7 @@ static struct sr_dev_driver beaglelogic_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = std_dev_list,
.dev_clear = std_dev_clear,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,

3
src/hardware/beaglelogic/beaglelogic_tcp.c
View File

@ -242,9 +242,6 @@ static int beaglelogic_open(struct dev_context *devc) {
}
static int beaglelogic_close(struct dev_context *devc) {
g_free(devc->address);
g_free(devc->port);
if (close(devc->socket) < 0)
return SR_ERR;