diff options
| -rw-r--r-- | src/nvim/file.c | 2 | ||||
| -rw-r--r-- | src/nvim/shada.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/file.c b/src/nvim/file.c index 35c659f7fd..2fb0e1cd87 100644 --- a/src/nvim/file.c +++ b/src/nvim/file.c @@ -310,7 +310,7 @@ ptrdiff_t file_skip(FileDescriptor *const fp, const size_t size) break; } read_bytes += (size_t)new_read_bytes; - } while (read_bytes < size && !fp->eof); + } while (read_bytes < size && !file_eof(fp)); return (ptrdiff_t)read_bytes; } diff --git a/src/nvim/shada.c b/src/nvim/shada.c index b4695603b2..a833b958b9 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -2883,12 +2883,12 @@ int shada_write_file(const char *const file, bool nomerge) char *const fname = shada_filename(file); char *tempname = NULL; - ShaDaWriteDef sd_writer = (ShaDaWriteDef) { + ShaDaWriteDef sd_writer = { .write = &write_file, .close = &close_sd_writer, .error = NULL, }; - ShaDaReadDef sd_reader; + ShaDaReadDef sd_reader = { .close = NULL }; if (!nomerge) { int error; @@ -2931,6 +2931,8 @@ shada_write_file_open: {} fname); xfree(fname); xfree(tempname); + assert(sd_reader.close != NULL); + sd_reader.close(&sd_reader); return FAIL; } else { (*wp)++; @@ -2974,6 +2976,9 @@ shada_write_file_nomerge: {} if (sd_writer.cookie == NULL) { xfree(fname); xfree(tempname); + if (sd_reader.close != NULL) { + sd_reader.close(&sd_reader); + } return FAIL; } |