44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001
|
|
From: Christos Zoulas <christos@zoulas.com>
|
|
Date: Mon, 26 Aug 2019 14:31:39 +0000
|
|
Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz)
|
|
|
|
---
|
|
src/cdf.c | 7 +++----
|
|
src/cdf.h | 1 +
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- src/cdf.c
|
|
+++ src/cdf.c 2019-10-22 13:05:01.410441092 +0000
|
|
@@ -968,8 +968,9 @@ cdf_read_property_info(const cdf_stream_
|
|
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;
|
|
@@ -1011,8 +1012,6 @@ cdf_read_property_info(const cdf_stream_
|
|
goto out;
|
|
inp += nelem;
|
|
}
|
|
- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
|
|
- nelements));
|
|
for (j = 0; j < nelements && i < sh.sh_properties;
|
|
j++, i++)
|
|
{
|
|
--- src/cdf.h
|
|
+++ src/cdf.h 2019-10-22 13:05:01.422440872 +0000
|
|
@@ -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
|