[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-1-ge4e018987

paul at claws-mail.org paul at claws-mail.org
Tue Nov 21 11:41:26 UTC 2023


The branch, gtk2 has been updated
       via  e4e018987a64667f5e6a891562143540a104bd79 (commit)
      from  334554b4afb99bbfa598fc499bf06e81731b6e9d (commit)

Summary of changes:
 src/mimeview.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit e4e018987a64667f5e6a891562143540a104bd79
Author: Paul <paul at claws-mail.org>
Date:   Tue Nov 21 11:40:17 2023 +0000

    if cmd is invalid, NULL it
    
    this prevents an execution attempt of an invalid command, and also prevents spewing text content into the debug output, and also prevents it being necessary to hit the Cancel button twice on the 'Open with...' dialogue

diff --git a/src/mimeview.c b/src/mimeview.c
index 0f9e3bc9f..8861cea05 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2241,9 +2241,10 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
 				g_chmod(filename, S_IRUSR|S_IWUSR);
  		} else {
 			g_warning("MIME viewer command-line is invalid: '%s'", cmd);
+			cmd = NULL;
 			mimeview_open_part_with(mimeview, partinfo, FALSE);
  		}
-		if (execute_command_line(buf, TRUE, NULL) != 0) {
+		if (cmd != NULL && execute_command_line(buf, TRUE, NULL) != 0) {
 			if (!prefs_common.save_parts_readwrite)
 				g_chmod(filename, S_IRUSR|S_IWUSR);
 			mimeview_open_part_with(mimeview, partinfo, FALSE);

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list