diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 12:13:23 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-31 15:37:40 +0200 |
| commit | bfb6c4c65781a610d21409d974227d73f264f41a (patch) | |
| tree | 47b99ff7c325298cd3fd28e07554a911578a7d13 /external | |
| parent | e072e4149ffd4c07be1b6ded38e560f9cb635515 (diff) | |
zlib: upgrade to release 1.2.12
Fixes CVE-2018-25032
external/zlib/ubsan.patch: remove, fixed upstream
Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/zlib/UnpackedTarball_zlib.mk | 4 | ||||
| -rw-r--r-- | external/zlib/ubsan.patch | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk index e74039d25089..dd9fc1c31445 100644 --- a/external/zlib/UnpackedTarball_zlib.mk +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_set_post_action,zlib,\ $(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) -$(eval $(call gb_UnpackedTarball_add_patches,zlib, \ - external/zlib/ubsan.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch deleted file mode 100644 index 2d7ff8d67967..000000000000 --- a/external/zlib/ubsan.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trees.c -+++ trees.c -@@ -870,7 +870,7 @@ - bi_windup(s); /* align on byte boundary */ - put_short(s, (ush)stored_len); - put_short(s, (ush)~stored_len); -- zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); -+ if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); - s->pending += stored_len; - #ifdef ZLIB_DEBUG - s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; |