diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-24 10:13:10 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-08-24 10:13:10 -0400 |
| commit | 107df8e65019b89f82249395bc09efe5dc9e2a7f (patch) | |
| tree | 552fc25b0159b83e08be798f5ae30dc3d80a5266 /Utilities/cmlibarchive/libarchive/archive_write_open_memory.c | |
| parent | 3d05964b0293a0bb9eb9f1f3b6d3cff1d86aa85a (diff) | |
| parent | dadea0e5ce7dd04c7a2c1d22f3fd12affdbd6a89 (diff) | |
| download | cmake-107df8e65019b89f82249395bc09efe5dc9e2a7f.tar.gz | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-12-26 (227a4b97)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_open_memory.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_open_memory.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_open_memory.c b/Utilities/cmlibarchive/libarchive/archive_write_open_memory.c index ea6ae0ac52..a8a0b817fc 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_open_memory.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_open_memory.c @@ -39,7 +39,7 @@ struct write_memory_data { unsigned char * buff; }; -static int memory_write_close(struct archive *, void *); +static int memory_write_free(struct archive *, void *); static int memory_write_open(struct archive *, void *); static ssize_t memory_write(struct archive *, void *, const void *buff, size_t); @@ -61,8 +61,8 @@ archive_write_open_memory(struct archive *a, void *buff, size_t buffSize, size_t mine->buff = buff; mine->size = buffSize; mine->client_size = used; - return (archive_write_open(a, mine, - memory_write_open, memory_write, memory_write_close)); + return (archive_write_open2(a, mine, + memory_write_open, memory_write, NULL, memory_write_free)); } static int @@ -103,11 +103,13 @@ memory_write(struct archive *a, void *client_data, const void *buff, size_t leng } static int -memory_write_close(struct archive *a, void *client_data) +memory_write_free(struct archive *a, void *client_data) { struct write_memory_data *mine; (void)a; /* UNUSED */ mine = client_data; + if (mine == NULL) + return (ARCHIVE_OK); free(mine); return (ARCHIVE_OK); } |