proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 10:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

synapticsmst: Fix several small memory leaks during enumeration

Browse Source
This commit is contained in:
Richard Hughes 2018-06-28 18:16:24 +01:00
parent 7015899c31
commit d3f2878f19
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/synapticsmst/fu-plugin-synapticsmst.c
View File

@ -144,7 +144,6 @@ fu_plugin_synaptics_scan_cascade (FuPlugin *plugin,
GError **error) GError **error)
{ {
g_autoptr(SynapticsMSTDevice) cascade_device = NULL; g_autoptr(SynapticsMSTDevice) cascade_device = NULL;
g_autofree gchar *dev_id_str = NULL;
FuDevice *fu_dev = NULL; FuDevice *fu_dev = NULL;
const gchar *aux_node; const gchar *aux_node;
@ -159,6 +158,7 @@ fu_plugin_synaptics_scan_cascade (FuPlugin *plugin,
for (guint8 j = 0; j < 2; j++) { for (guint8 j = 0; j < 2; j++) {
guint8 layer = synapticsmst_device_get_layer (device) + 1; guint8 layer = synapticsmst_device_get_layer (device) + 1;
guint16 rad = synapticsmst_device_get_rad (device) | (j << (2 * (layer - 1))); guint16 rad = synapticsmst_device_get_rad (device) | (j << (2 * (layer - 1)));
g_autofree gchar *dev_id_str = NULL;
dev_id_str = g_strdup_printf ("MST-REMOTE-%s-%u-%u", dev_id_str = g_strdup_printf ("MST-REMOTE-%s-%u-%u",
aux_node, layer, rad); aux_node, layer, rad);
fu_dev = fu_plugin_cache_lookup (plugin, dev_id_str); fu_dev = fu_plugin_cache_lookup (plugin, dev_id_str);
@ -205,11 +205,11 @@ fu_plugin_synaptics_scan_cascade (FuPlugin *plugin,
static void static void
fu_plugin_synapticsmst_remove_cascaded (FuPlugin *plugin, const gchar *aux_node) fu_plugin_synapticsmst_remove_cascaded (FuPlugin *plugin, const gchar *aux_node)
{ {
g_autofree gchar *dev_id_str = NULL;
FuDevice *fu_dev = NULL; FuDevice *fu_dev = NULL;
for (guint8 i=0; i < 8; i++) { for (guint8 i = 0; i < 8; i++) {
for (guint16 j=0; j < 256; j++) { for (guint16 j = 0; j < 256; j++) {
g_autofree gchar *dev_id_str = NULL;
dev_id_str = g_strdup_printf ("MST-REMOTE-%s-%u-%u", dev_id_str = g_strdup_printf ("MST-REMOTE-%s-%u-%u",
aux_node, i, j); aux_node, i, j);
fu_dev = fu_plugin_cache_lookup (plugin, dev_id_str); fu_dev = fu_plugin_cache_lookup (plugin, dev_id_str);
@ -230,7 +230,6 @@ fu_plugin_synapticsmst_enumerate (FuPlugin *plugin,
g_autoptr(GDir) dir = NULL; g_autoptr(GDir) dir = NULL;
const gchar *dp_aux_dir; const gchar *dp_aux_dir;
const gchar *aux_node = NULL; const gchar *aux_node = NULL;
g_autofree gchar *dev_id_str = NULL;
dp_aux_dir = g_getenv ("FWUPD_SYNAPTICSMST_FW_DIR"); dp_aux_dir = g_getenv ("FWUPD_SYNAPTICSMST_FW_DIR");
if (dp_aux_dir == NULL) if (dp_aux_dir == NULL)
@ -239,6 +238,7 @@ fu_plugin_synapticsmst_enumerate (FuPlugin *plugin,
g_debug ("Using %s to look for MST devices", dp_aux_dir); g_debug ("Using %s to look for MST devices", dp_aux_dir);
dir = g_dir_open (dp_aux_dir, 0, NULL); dir = g_dir_open (dp_aux_dir, 0, NULL);
do { do {
g_autofree gchar *dev_id_str = NULL;
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
g_autoptr(SynapticsMSTDevice) device = NULL; g_autoptr(SynapticsMSTDevice) device = NULL;
FuDevice *fu_dev = NULL; FuDevice *fu_dev = NULL;

8
plugins/synapticsmst/synapticsmst-device.c
View File

@ -107,11 +107,11 @@ synapticsmst_device_init (SynapticsMSTDevice *device)
{ {
SynapticsMSTDevicePrivate *priv = GET_PRIVATE (device); SynapticsMSTDevicePrivate *priv = GET_PRIVATE (device);
const gchar *tmp; const gchar *tmp;
priv->test_mode = FALSE;
priv->fw_dir = g_strdup ("/dev");
tmp = g_getenv ("FWUPD_SYNAPTICSMST_FW_DIR"); tmp = g_getenv ("FWUPD_SYNAPTICSMST_FW_DIR");
if (tmp != NULL) { if (tmp == NULL) {
priv->test_mode = FALSE;
priv->fw_dir = g_strdup ("/dev");
} else {
priv->test_mode = TRUE; priv->test_mode = TRUE;
priv->fw_dir = g_strdup (tmp); priv->fw_dir = g_strdup (tmp);
} }