[Commits] [SCM] claws branch, master, updated. 3.18.0-192-gf930692ab

[wwp at claws-mail.org]

The branch, master has been updated
       via  f930692abee77f95f533f41959bbbfbf1129a78c (commit)
      from  045269e915ee5d0c7345c9f08ecb347037b2efee (commit)

Summary of changes:
 src/plugins/pgpcore/passphrase.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit f930692abee77f95f533f41959bbbfbf1129a78c
Author: wwp <subscript at free.fr>
Date:   Tue Sep 28 17:07:13 2021 +0200

    Fix CID 1491150: resource leaks.

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 9ef1ae55b..cd23cc486 100644
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -257,23 +257,18 @@ create_description(const gchar *uid_hint, gint prev_bad, gint new_key)
     	*(strchr(my_uid, '>')) = ')';
 
     if (new_key == 1) {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
-					_("Please enter the passphrase for the new key:"),
-					"</span>\n\n%.*s\n", NULL),
-                           prev_bad ?
-                           _("Passphrases did not match.\n") : "",
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s%s</span>\n\n%.*s\n",
+                           prev_bad ? _("Passphrases did not match.\n") : "",
+                           _("Please enter the passphrase for the new key:"),
                            linelen (my_uid), my_uid);
     } else if (new_key == 2) {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">",
-				_("Please re-enter the passphrase for the new key:"),
-				"</span>\n\n%.*s\n", NULL),
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%.*s\n",
+                           _("Please re-enter the passphrase for the new key:"),
                            linelen (my_uid), my_uid);
     } else {
-	    buf = g_strdup_printf (g_strconcat("<span weight=\"bold\" size=\"larger\">%s",
-				_("Please enter the passphrase for:"),
-				"</span>\n\n%.*s\n", NULL),
-                           prev_bad ?
-                           _("Bad passphrase.\n") : "",
+	    buf = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s%s</span>\n\n%.*s\n",
+                           prev_bad ? _("Bad passphrase.\n") : "",
+                           _("Please enter the passphrase for:"),
                            linelen (my_uid), my_uid);
     }
     g_free(my_uid);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail