diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-22 19:04:59 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-22 19:07:43 +0100 |
| commit | 2c3c482d034409a5de8c2c754fc5985b06a97905 (patch) | |
| tree | 8dbbee96d78553dbb4970eaa3c08f20596a872f8 /main/file/CVE-2019-18218.patch | |
| parent | f650e076f1d3707252a60bf8ca4ff19a19dc595e (diff) | |
| download | aports-2c3c482d034409a5de8c2c754fc5985b06a97905.tar.bz2 aports-2c3c482d034409a5de8c2c754fc5985b06a97905.tar.xz | |
main/file: upgrade to 5.38
Diffstat (limited to 'main/file/CVE-2019-18218.patch')
| -rw-r--r-- | main/file/CVE-2019-18218.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/main/file/CVE-2019-18218.patch b/main/file/CVE-2019-18218.patch deleted file mode 100644 index e7eba44922..0000000000 --- a/main/file/CVE-2019-18218.patch +++ /dev/null @@ -1,40 +0,0 @@ -Source: https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84 - -diff --git a/src/cdf.c b/src/cdf.c -index 556a3ff..8bb0a6d 100644 ---- a/src/cdf.c -+++ b/src/cdf.c -@@ -1013,8 +1013,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - } - nelements = CDF_GETUINT32(q, 1); -- if (nelements == 0) { -- DPRINTF(("CDF_VECTOR with nelements == 0\n")); -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { -+ DPRINTF(("CDF_VECTOR with nelements == %" -+ SIZE_T_FORMAT "u\n", nelements)); - goto out; - } - slen = 2; -@@ -1056,8 +1057,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, - goto out; - inp += nelem; - } -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", -- nelements)); - for (j = 0; j < nelements && i < sh.sh_properties; - j++, i++) - { -diff --git a/src/cdf.h b/src/cdf.h -index 2f7e554..0505666 100644 ---- a/src/cdf.h -+++ b/src/cdf.h -@@ -48,6 +48,7 @@ - typedef int32_t cdf_secid_t; - - #define CDF_LOOP_LIMIT 10000 -+#define CDF_ELEMENT_LIMIT 100000 - - #define CDF_SECID_NULL 0 - #define CDF_SECID_FREE -1 - |