|
 |
155c30 |
diff -up thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok.c
|
|
|
155c30 |
--- thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235 2022-03-02 17:57:38.364361168 +0100
|
|
|
155c30 |
+++ thunderbird-91.7.0/parser/expat/lib/xmltok.c 2022-03-02 17:58:22.235512399 +0100
|
|
|
155c30 |
@@ -65,13 +65,6 @@
|
|
|
155c30 |
+ ((((byte)[2]) >> 5) & 1)] \
|
|
|
155c30 |
& (1u << (((byte)[2]) & 0x1F)))
|
|
|
155c30 |
|
|
|
155c30 |
-#define UTF8_GET_NAMING(pages, p, n) \
|
|
|
155c30 |
- ((n) == 2 \
|
|
|
155c30 |
- ? UTF8_GET_NAMING2(pages, (const unsigned char *)(p)) \
|
|
|
155c30 |
- : ((n) == 3 \
|
|
|
155c30 |
- ? UTF8_GET_NAMING3(pages, (const unsigned char *)(p)) \
|
|
|
155c30 |
- : 0))
|
|
|
155c30 |
-
|
|
|
155c30 |
/* Detection of invalid UTF-8 sequences is based on Table 3.1B
|
|
|
155c30 |
of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/
|
|
|
155c30 |
with the additional restriction of not allowing the Unicode
|
|
|
155c30 |
diff -up thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c
|
|
|
155c30 |
--- thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235 2022-03-02 17:57:38.365361172 +0100
|
|
|
155c30 |
+++ thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c 2022-03-02 18:04:51.240853247 +0100
|
|
|
155c30 |
@@ -34,7 +34,7 @@
|
|
|
155c30 |
case BT_LEAD ## n: \
|
|
|
155c30 |
if (end - ptr < n) \
|
|
|
155c30 |
return XML_TOK_PARTIAL_CHAR; \
|
|
|
155c30 |
- if (!IS_NAME_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
+ if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NAME_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
*nextTokPtr = ptr; \
|
|
|
155c30 |
return XML_TOK_INVALID; \
|
|
|
155c30 |
} \
|
|
|
155c30 |
@@ -62,7 +62,7 @@
|
|
|
155c30 |
case BT_LEAD ## n: \
|
|
|
155c30 |
if (end - ptr < n) \
|
|
|
155c30 |
return XML_TOK_PARTIAL_CHAR; \
|
|
|
155c30 |
- if (!IS_NMSTRT_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
+ if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NMSTRT_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
*nextTokPtr = ptr; \
|
|
|
155c30 |
return XML_TOK_INVALID; \
|
|
|
155c30 |
} \
|
|
|
155c30 |
@@ -1090,6 +1090,10 @@ PREFIX(prologTok)(const ENCODING *enc, c
|
|
|
155c30 |
case BT_LEAD ## n: \
|
|
|
155c30 |
if (end - ptr < n) \
|
|
|
155c30 |
return XML_TOK_PARTIAL_CHAR; \
|
|
|
155c30 |
+ if (IS_INVALID_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
+ *nextTokPtr = ptr; \
|
|
|
155c30 |
+ return XML_TOK_INVALID; \
|
|
|
155c30 |
+ } \
|
|
|
155c30 |
if (IS_NMSTRT_CHAR(enc, ptr, n)) { \
|
|
|
155c30 |
ptr += n; \
|
|
|
155c30 |
tok = XML_TOK_NAME; \
|