diff options
Diffstat (limited to 'contrib/libarchive/libarchive/archive_write.c')
| -rw-r--r-- | contrib/libarchive/libarchive/archive_write.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/libarchive/libarchive/archive_write.c b/contrib/libarchive/libarchive/archive_write.c index 5b5db520c84c..62c74d9932d4 100644 --- a/contrib/libarchive/libarchive/archive_write.c +++ b/contrib/libarchive/libarchive/archive_write.c @@ -232,6 +232,10 @@ __archive_write_filter(struct archive_write_filter *f, int r; if (length == 0) return(ARCHIVE_OK); + if (f->write == NULL) + /* If unset, a fatal error has already ocuured, so this filter + * didn't open. We cannot write anything. */ + return(ARCHIVE_FATAL); r = (f->write)(f, buff, length); f->bytes_written += length; return (r); @@ -437,6 +441,8 @@ archive_write_client_close(struct archive_write_filter *f) (*a->client_closer)(&a->archive, a->client_data); free(state->buffer); free(state); + /* Clear the close handler myself not to be called again. */ + f->close = NULL; a->client_data = NULL; return (ret); } |