diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-20 15:36:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-20 15:36:18 (GMT) |
| commit | 6df1bda1c57193b289866389a994ea79a2f5e1d8 (patch) | |
| tree | 7bf31a5dc1702e7a0faebe654da69f5c5eaeca90 /Utilities/cmlibarchive/libarchive/archive_read.c | |
| parent | b6674431af4790ba5deea9e5e6bd7b2620beb69e (diff) | |
| parent | 11f3dcb04887fccf38a8eda19d498bf7a5060486 (diff) | |
| download | CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.zip CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.tar.gz CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_read.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read.c b/Utilities/cmlibarchive/libarchive/archive_read.c index d1feceb..a642a33 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read.c +++ b/Utilities/cmlibarchive/libarchive/archive_read.c @@ -881,7 +881,8 @@ archive_read_data(struct archive *_a, void *buff, size_t s) len = a->read_data_remaining; if (len > s) len = s; - memcpy(dest, a->read_data_block, len); + if (len) + memcpy(dest, a->read_data_block, len); s -= len; a->read_data_block += len; a->read_data_remaining -= len; |