38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From 8e439a9947e9dc80a395c0c7456545d8d9d9e421 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Pipping <sebastian@pipping.org>
|
||
|
|
Date: Mon, 19 Aug 2024 22:34:13 +0200
|
||
|
|
Subject: [PATCH] lib: Detect integer overflow in dtdCopy
|
||
|
|
|
||
|
|
Reported by TaiYou
|
||
|
|
|
||
|
|
Conflict:context adapt
|
||
|
|
Reference:https://github.com/libexpat/libexpat/commit/8e439a9947e9dc80a395c0c7456545d8d9d9e421
|
||
|
|
---
|
||
|
|
lib/expat/xmlparse/xmlparse.c | 10 ++++++++++
|
||
|
|
1 file changed, 10 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/lib/expat/xmlparse/xmlparse.c b/lib/expat/xmlparse/xmlparse.c
|
||
|
|
index 91682c18..e2327bdc 100644
|
||
|
|
--- a/lib/expat/xmlparse/xmlparse.c
|
||
|
|
+++ b/lib/expat/xmlparse/xmlparse.c
|
||
|
|
@@ -7016,6 +7016,16 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd)
|
||
|
|
if (!newE)
|
||
|
|
return 0;
|
||
|
|
if (oldE->nDefaultAtts) {
|
||
|
|
+ /* Detect and prevent integer overflow.
|
||
|
|
+ * The preprocessor guard addresses the "always false" warning
|
||
|
|
+ * from -Wtype-limits on platforms where
|
||
|
|
+ * sizeof(int) < sizeof(size_t), e.g. on x86_64. */
|
||
|
|
+#if UINT_MAX >= SIZE_MAX
|
||
|
|
+ if ((size_t)oldE->nDefaultAtts
|
||
|
|
+ > ((size_t)(-1) / sizeof(DEFAULT_ATTRIBUTE))) {
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+#endif
|
||
|
|
newE->defaultAtts = (DEFAULT_ATTRIBUTE *)
|
||
|
|
malloc(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));
|
||
|
|
if (!newE->defaultAtts)
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|