fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 20:40:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: don't crash on failure to write

Browse source 
The log statement ended up using wrong (always NULL) connection to get
ID from. Fix.

Resolves: https://issues.redhat.com/browse/RHEL-77157
This commit is contained in:
Lubomir Rintel 2025-02-12 10:42:25 +01:00
parent 2ee54e66c3
commit a7cf9d399f
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
View file

@ -880,12 +880,11 @@ nms_keyfile_plugin_update_connection(NMSKeyfilePlugin *self,
NMConnection **out_connection,
GError **error)
{
NMSKeyfilePluginPrivate *priv = NMS_KEYFILE_PLUGIN_GET_PRIVATE(self);
NMSKeyfileStorage *storage = NMS_KEYFILE_STORAGE(storage_x);
gs_unref_object NMConnection *connection_clone = NULL;
gs_unref_object NMConnection *reread = NULL;
gs_free char *full_filename = NULL;
gs_free_error GError *local = NULL;
NMSKeyfilePluginPrivate *priv = NMS_KEYFILE_PLUGIN_GET_PRIVATE(self);
NMSKeyfileStorage *storage = NMS_KEYFILE_STORAGE(storage_x);
gs_unref_object NMConnection *reread = NULL;
gs_free char *full_filename = NULL;
gs_free_error GError *local = NULL;
struct timespec mtime;
const char *previous_filename;
gboolean reread_same;
@ -946,7 +945,7 @@ nms_keyfile_plugin_update_connection(NMSKeyfilePlugin *self,
&local)) {
_LOGW("commit: failure to write %s (%s) to \"%s\": %s",
uuid,
nm_connection_get_id(connection_clone),
nm_connection_get_id(connection),
previous_filename,
local->message);
g_propagate_error(error, g_steal_pointer(&local));