vim: src/fileio.c comparison

comparison src/fileio.c @ 32503:5d07e7e9580f v9.0.1583

patch 9.0.1583: get E304 when using 'cryptmethod' "xchacha20v2" Commit: https://github.com/vim/vim/commit/3a2a60ce4a8e73594bca16814672fcc243d093ac Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 27 18:02:55 2023 +0100 patch 9.0.1583: get E304 when using 'cryptmethod' "xchacha20v2" Problem: Get E304 when using 'cryptmethod' "xchacha20v2". (Steve Mynott) Solution: Add 4th crypt method to block zero ID check. Avoid syncing a swap file before reading the file. (closes #12433)

author	Bram Moolenaar <Bram@vim.org>
date	Sat, 27 May 2023 19:15:04 +0200
parents	3d4e28569a6d
children	a4b5a6a95005

comparison

equal deleted inserted replaced

-:b1bb97d879b6
+:5d07e7e9580f
 linenr_T	lines_to_skip,
 linenr_T	lines_to_read,
 exarg_T	*eap,			// can be NULL!
 int		flags)
 {
+int		retval = FAIL;	// jump to "theend" instead of returning
 int		fd = 0;
 int		newfile = (flags & READ_NEW);
 int		check_readonly;
 int		filtering = (flags & READ_FILTER);
 int		read_stdin = (flags & READ_STDIN);
 	    && fname != NULL
 	    && vim_strchr(p_cpo, CPO_FNAMER) != NULL
 	    && !(flags & READ_DUMMY))
 {
 	if (set_rw_fname(fname, sfname) == FAIL)
-	    return FAIL;
+	    goto theend;
 }
 // Remember the initial values of curbuf, curbuf->b_ffname and
 // curbuf->b_fname to detect whether they are altered as a result of
 // executing nasty autocommands.  Also check if "fname" and "sfname"
 	if (newfile)
 	{
 	    if (apply_autocmds_exarg(EVENT_BUFREADCMD, NULL, sfname,
 							  FALSE, curbuf, eap))
 	    {
-		int status = OK;
+		retval = OK;
 #ifdef FEAT_EVAL
 		if (aborting())
-		    status = FAIL;
+		    retval = FAIL;
 #endif
 		// The BufReadCmd code usually uses ":read" to get the text and
 		// perhaps ":file" to change the buffer name. But we should
 		// consider this to work like ":edit", thus reset the
 		// BF_NOTEDITED flag.  Then ":write" will work to overwrite the
 		// same file.
-		if (status == OK)
+		if (retval == OK)
 		    curbuf->b_flags &= ~BF_NOTEDITED;
-		return status;
+		goto theend;
 	    }
 	}
 	else if (apply_autocmds_exarg(EVENT_FILEREADCMD, sfname, sfname,
 							    FALSE, NULL, eap))
+	{
 #ifdef FEAT_EVAL
-	    return aborting() ? FAIL : OK;
+	    retval = aborting() ? FAIL : OK;
 #else
-	    return OK;
+	    retval = OK;
 #endif
+	    goto theend;
+	}
 	curbuf->b_op_start = orig_start;
 	if (flags & READ_NOFILE)
+	{
 	    // Return NOTDONE instead of FAIL so that BufEnter can be triggered
 	    // and other operations don't fail.
-	    return NOTDONE;
+	    retval = NOTDONE;
+	    goto theend;
+	}
 }
 if ((shortmess(SHM_OVER) || curbuf->b_help) && p_verbose == 0)
 	msg_scroll = FALSE;	// overwrite previous file message
 else
 	if (namelen >= MAXPATHL)
 	{
 	    filemess(curbuf, fname, (char_u *)_("Illegal file name"), 0);
 	    msg_end();
 	    msg_scroll = msg_save;
-	    return FAIL;
+	    goto theend;
 	}
 	// If the name ends in a path separator, we can't open it.  Check here,
 	// because reading the file may actually work, but then creating the
 	// swap file may destroy it!  Reported on MS-DOS and Win 95.
 	if (after_pathsep(fname, fname + namelen))
 	{
 	    filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0);
 	    msg_end();
 	    msg_scroll = msg_save;
-	    return NOTDONE;
+	    retval = NOTDONE;
+	    goto theend;
 	}
 }
 if (!read_stdin && !read_buffer && !read_fifo)
 {
 		      && !(S_ISCHR(perm) && is_dev_fd_file(fname))
 			// ... or a character special file named /dev/fd/<n>
 # endif
 						)
 	{
-	    int retval = FAIL;
 	    if (S_ISDIR(perm))
 	    {
 		filemess(curbuf, fname, (char_u *)_(msg_is_a_directory), 0);
 		retval = NOTDONE;
 	    }
 	    else
 		filemess(curbuf, fname, (char_u *)_("is not a file"), 0);
 	    msg_end();
 	    msg_scroll = msg_save;
-	    return retval;
+	    goto theend;
 	}
 #endif
 #if defined(MSWIN)
 	/*
 	 * MS-Windows allows opening a device, but we will probably get stuck
 	if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
 	{
 	    filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option)"), 0);
 	    msg_end();
 	    msg_scroll = msg_save;
-	    return FAIL;
+	    goto theend;
 	}
 #endif
 }
 // Set default or forced 'fileformat' and 'binary'.
 					&& (old_b_ffname != curbuf->b_ffname))
 				|| (using_b_fname
 					 && (old_b_fname != curbuf->b_fname)))
 			{
 			    emsg(_(e_autocommands_changed_buffer_or_buffer_name));
-			    return FAIL;
+			    goto theend;
 			}
 		    }
 		    if (dir_of_file_exists(fname))
 			filemess(curbuf, sfname,
 					      (char_u *)new_file_message(), 0);
 							  FALSE, curbuf, eap);
 		    // remember the current fileformat
 		    save_file_ff(curbuf);
 #if defined(FEAT_EVAL)
-		    if (aborting())   // autocmds may abort script processing
+		    if (!aborting())   // autocmds may abort script processing
-			return FAIL;
+#endif
-#endif
+			retval = OK;	    // a new file is not an error
-		    return OK;	    // a new file is not an error
+		    goto theend;
 		}
 		else
 		{
 		    filemess(curbuf, sfname, (char_u *)(
 # ifdef EFBIG
 						_("[Permission Denied]")), 0);
 		    curbuf->b_p_ro = TRUE;	// must use "w!" now
 		}
 	    }
-	return FAIL;
+	goto theend;
 }
 /*
 * Only set the 'ro' flag for readonly files the first time they are
 * loaded.	Help files always get readonly mode
 		|| (using_b_fname && (old_b_fname != curbuf->b_fname))))
 	{
 	    emsg(_(e_autocommands_changed_buffer_or_buffer_name));
 	    if (!read_buffer)
 		close(fd);
-	    return FAIL;
+	    goto theend;
 	}
 #ifdef UNIX
 	// Set swap file protection bits after creating it.
 	if (swap_mode > 0 && curbuf->b_ml.ml_mfp != NULL
 			  && curbuf->b_ml.ml_mfp->mf_fname != NULL)
 // If "Quit" selected at ATTENTION dialog, don't load the file
 if (swap_exists_action == SEA_QUIT)
 {
 	if (!read_buffer && !read_stdin)
 	    close(fd);
-	return FAIL;
+	goto theend;
 }
 ++no_wait_return;	    // don't wait for return yet
 /*
 	if (aborting())	    // autocmds may abort script processing
 	{
 	    --no_wait_return;
 	    msg_scroll = msg_save;
 	    curbuf->b_p_ro = TRUE;	// must use "w!" now
-	    return FAIL;
+	    goto theend;
 	}
 #endif
 	/*
 	 * Don't allow the autocommands to change the current buffer.
 	 * Try to re-open the file.
 	    if (fd < 0)
 		emsg(_(e_readpre_autocommands_made_file_unreadable));
 	    else
 		emsg(_(e_readpre_autocommands_must_not_change_current_buffer));
 	    curbuf->b_p_ro = TRUE;	// must use "w!" now
-	    return FAIL;
+	    goto theend;
 	}
 }
 // Autocommands may add lines to the file, need to check if it is empty
 wasempty = (curbuf->b_ml.ml_flags & ML_EMPTY);
 	    }
 	    msg_scroll = msg_save;
 #ifdef FEAT_VIMINFO
 	    check_marks_read();
 #endif
-	    return OK;		// an interrupt isn't really an error
+	    retval = OK;	// an interrupt isn't really an error
+	    goto theend;
 	}
 	if (!filtering && !(flags & READ_DUMMY))
 	{
 	    msg_add_fname(curbuf, sfname);   // fname in IObuff with quotes
 							    FALSE, NULL, eap);
 	if (msg_scrolled == n)
 	    msg_scroll = m;
 # ifdef FEAT_EVAL
 	if (aborting())	    // autocmds may abort script processing
-	    return FAIL;
+	    goto theend;
 # endif
 }
-if (recoverymode && error)
+if (!(recoverymode && error))
-	return FAIL;
+	retval = OK;
-return OK;
+theend:
+if (curbuf->b_ml.ml_mfp != NULL
+		       && curbuf->b_ml.ml_mfp->mf_dirty == MF_DIRTY_YES_NOSYNC)
+	// OK to sync the swap file now
+	curbuf->b_ml.ml_mfp->mf_dirty = MF_DIRTY_YES;
+return retval;
 }
 #if defined(OPEN_CHR_FILES) || defined(PROTO)
 /*
 * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+",
 	// Set the cryptmethod local to the buffer.
 	crypt_set_cm_option(curbuf, method);
 	if (cryptkey == NULL && !*did_ask)
 	{
 	    if (*curbuf->b_p_key)
+	    {
 		cryptkey = curbuf->b_p_key;
+		crypt_check_swapfile_curbuf();
+	    }
 	    else
 	    {
 		// When newfile is TRUE, store the typed key in the 'key'
 		// option and don't free it.  bf needs hash of the key saved.
 		// Don't ask for the key again when first time Enter was hit.

Mercurial > vim

comparison src/fileio.c @ 32503:5d07e7e9580f v9.0.1583