From 81499355b049fffadfa6576bbcd2d2fb9fac9d13 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 May 2016 14:19:59 +0200 Subject: [PATCH] libnm: don't require initialized @out_encrypted argument in nm_utils_file_is_private_key() No need to require the caller to initialize the optional out-argument. Otherwise we get: (nm-connection-editor:2471): libnm-CRITICAL **: nm_utils_file_is_private_key: assertion 'out_encrypted == NULL || *out_encrypted == FALSE' failed https://bugzilla.gnome.org/show_bug.cgi?id=763578 Fixes: 1c4f41c61013d79a32eeac246d204c2f378e6915 --- libnm-core/nm-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 1a7de119c0..81676e9f1f 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -2403,8 +2403,8 @@ nm_utils_file_is_private_key (const char *filename, gboolean *out_encrypted) const char *extensions[] = { ".der", ".pem", ".p12", ".key", NULL }; g_return_val_if_fail (filename != NULL, FALSE); - g_return_val_if_fail (out_encrypted == NULL || *out_encrypted == FALSE, FALSE); + NM_SET_OUT (out_encrypted, FALSE); if (!file_has_extension (filename, extensions)) return FALSE;