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

merge: branch 'bg/coverity'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/495
This commit is contained in:
Beniamino Galvani 2020-05-07 10:37:56 +02:00
commit be3549abbd
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/common/nm-polkit-listener.c
View file

@ -339,7 +339,7 @@ retrieve_session_id_cb (GObject *source_object,
NMPolkitListener *listener = NM_POLKIT_LISTENER (user_data);
char *session_id;
guint32 session_uid;
nm_auto_free_variant_iter GVariantIter *iter;
nm_auto_free_variant_iter GVariantIter *iter = NULL;
gs_unref_variant GVariant *ret = NULL;
gs_free_error GError *error = NULL;
gs_free char *err_str = NULL;
@ -663,7 +663,7 @@ dbus_method_call_cb (GDBusConnection *connection,
const char *message;
const char *cookie;
AuthRequest *request;
gs_unref_variant GVariant *identities_gvariant;
gs_unref_variant GVariant *identities_gvariant = NULL;
if (nm_streq (method_name, "BeginAuthentication")) {
g_variant_get (parameters,

2
libnm-core/nm-utils.c
View file

@ -5444,7 +5444,7 @@ attribute_escape (const char *src, char c1, char c2)
{
char *ret, *dest;
dest = ret = malloc (strlen (src) * 2 + 1);
dest = ret = g_malloc (strlen (src) * 2 + 1);
while (*src) {
if (*src == c1 || *src == c2 || *src == '\\')

3
libnm/nm-libnm-utils.h
View file

@ -671,7 +671,8 @@ NML_IS_DBUS_OBJECT (NMLDBusObject *dbobj)
nm_assert ( !dbobj
|| ( NM_IS_REF_STRING (dbobj->dbus_path)
&& dbobj->ref_count > 0));
nm_assert ( !dbobj->nmobj
nm_assert ( !dbobj
|| !dbobj->nmobj
|| NM_IS_OBJECT (dbobj->nmobj)
|| NM_IS_CLIENT (dbobj->nmobj));
return !!dbobj;

2
libnm/tests/test-libnm.c
View file

@ -3103,7 +3103,7 @@ test_nm_auth_permissions (void)
g_assert (s == nm_auth_permission_names_by_idx[i - 1]);
g_assert_cmpint (nm_auth_permission_from_string (s), ==, i);
}
return;
for (i = 0; i < NM_CLIENT_PERMISSION_LAST; i++)
g_assert_cmpint (nm_auth_permission_from_string (nm_auth_permission_names_by_idx[i]), ==, i + 1);
}

7
src/settings/plugins/ifcfg-rh/shvar.c
View file

@ -1492,6 +1492,13 @@ svWriteFile (shvarFile *s, int mode, GError **error)
return FALSE;
}
f = fdopen (tmpfd, "w");
if (!f) {
errsv = errno;
g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errsv),
"Internal error writing file '%s': %s",
s->fileName, nm_strerror_native (errsv));
return FALSE;
}
fseek (f, 0, SEEK_SET);
c_list_for_each (current, &s->lst_head) {
const shvarLine *line = c_list_entry (current, shvarLine, lst);