patch 8.2.0521: crash when reading a blob fails
Problem: Crash when reading a blob fails.
Solution: Avoid keeping a pointer to a freed blob object. (Dominique Pelle,
closes #5890) Adjust error messages.
diff --git a/src/filepath.c b/src/filepath.c
index 37455a2..15372af 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -1452,20 +1452,18 @@
maxline = (long)tv_get_number(&argvars[2]);
}
- if (blob)
- {
- if (rettv_blob_alloc(rettv) == FAIL)
- return;
- }
- else
- {
- if (rettv_list_alloc(rettv) == FAIL)
- return;
- }
+ if ((blob ? rettv_blob_alloc(rettv) : rettv_list_alloc(rettv)) == FAIL)
+ return;
// Always open the file in binary mode, library functions have a mind of
// their own about CR-LF conversion.
fname = tv_get_string(&argvars[0]);
+
+ if (mch_isdir(fname))
+ {
+ semsg(_(e_isadir2), fname);
+ return;
+ }
if (*fname == NUL || (fd = mch_fopen((char *)fname, READBIN)) == NULL)
{
semsg(_(e_notopen), *fname == NUL ? (char_u *)_("<empty>") : fname);
@@ -1476,8 +1474,10 @@
{
if (read_blob(fd, rettv->vval.v_blob) == FAIL)
{
- emsg("cannot read file");
+ semsg(_(e_notread), fname);
+ // An empty blob is returned on error.
blob_free(rettv->vval.v_blob);
+ rettv->vval.v_blob = NULL;
}
fclose(fd);
return;
diff --git a/src/testdir/test_blob.vim b/src/testdir/test_blob.vim
index 2e5ef0b..0170f54 100644
--- a/src/testdir/test_blob.vim
+++ b/src/testdir/test_blob.vim
@@ -257,6 +257,9 @@
let br = readfile('Xblob', 'B')
call assert_equal(b, br)
call delete('Xblob')
+
+ " This was crashing when calling readfile() with a directory.
+ call assert_fails("call readfile('.', 'B')", 'E17: "." is a directory')
endfunc
" filter() item in blob
diff --git a/src/version.c b/src/version.c
index b73dd61..22ac6a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 521,
+/**/
520,
/**/
519,