!5 update to 2.2.10

From: @wangchen2020
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1

Don-t-add-to-NULL-in-iterator.patch

@@ -1,36 +0,0 @@
-From 49c165c5a8a40c0ef6a9cee00a81adac2da71533 Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman@chromium.org>
-Date: Tue, 7 Apr 2020 13:12:18 -0400
-Subject: [PATCH 67/68] Don't add to NULL in iterator.
-
-In C it is undefined to add anything to NULL. Clang recently began
-taking advantage of this and can assume that if anything is added or
-subtracted from a pointer that the pointer can be assumed non-NULL. The
-Address Sanitizer has been updated to report when this happens at
-runtime and produces messages like
-
-expat/lib/xmlparse.c:6509:23: runtime error: applying zero offset to null pointer
-SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior expat/lib/xmlparse.c:6509:23
-
-This can be mitigated with 'p ? p + n : NULL' which optimizes to just
-the add in all optimizing compilers, but avoids the undefined behavior.
----
- lib/xmlparse.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index 638ea52..849411c 100644
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -6506,7 +6506,7 @@ hashTableInit(HASH_TABLE *p, const XML_Memory_Handling_Suite *ms) {
- static void FASTCALL
- hashTableIterInit(HASH_TABLE_ITER *iter, const HASH_TABLE *table) {
-   iter->p = table->v;
--  iter->end = iter->p + table->size;
-+  iter->end = iter->p ? iter->p + table->size : NULL;
- }
- 
- static NAMED *FASTCALL
--- 
-1.8.3.1
-

expat.spec

@@ -1,15 +1,12 @@
 %define Rversion %(echo %{version} | sed -e 's/\\./_/g' -e 's/^/R_/')
 Name:           expat
-Version:        2.2.9
+Version:        2.2.10
-Release:        2
+Release:        1
 Summary:        An XML parser library
 License:        MIT
 URL:            https://libexpat.github.io/
 Source0:        https://github.com/libexpat/libexpat/releases/download/%{Rversion}/expat-%{version}.tar.gz
 
-Patch0000:      xmlparse.c-Fix-undefined-behavior-for-XML_UNICODE.patch
-Patch0001:      Don-t-add-to-NULL-in-iterator.patch
-
 BuildRequires:  sed,autoconf,automake,gcc-c++,libtool,xmlto
 
 %description
@@ -61,6 +58,9 @@ make check
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 20 2021 wangchen <wangchen137@huawei.com> - 2.2.10-1
+- update to 2.2.10
+
 * Sun Jun 28 2020 liuchenguang <liuchenguang4@huawei.com> - 2.2.9-2
 - quality enhancement synchronization github patch
 

xmlparse.c-Fix-undefined-behavior-for-XML_UNICODE.patch

@@ -1,63 +0,0 @@
-From ef09dbabd409f7b4d42c40c03b74f718aa1b17c1 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 19 Mar 2020 15:22:58 +0100
-Subject: [PATCH 64/68] xmlparse.c: Fix undefined behavior for XML_UNICODE
-
-Pointer arithmetic with NULL is undefined behavior.
-This reverts c71f27573bd0205558a78792b554764f9c962179
----
- Changes        |  4 ++++
- lib/xmlparse.c | 15 ++++++++++++---
- 2 files changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/Changes b/Changes
-index 1680489..a801d7f 100644
---- a/Changes
-+++ b/Changes
-@@ -3,6 +3,10 @@ NOTE: We are looking for help with a few things:
-       If you can help, please get in touch.  Thanks!
-
- Release 2.2.9 Wed Septemper 25 2019
-+        Bug fixes:
-+       #390 #395  Fix undefined behavior during parsing when compiled with
-+                    -DXML_UNICODE that was introduced with Expat 2.0.1
-+
-         Other changes:
-                   examples: Drop executable bits from elements.c
-             #349  Windows: Change the name of the Windows DLLs from expat*.dll
-diff --git a/lib/xmlparse.c b/lib/xmlparse.c
-index 8b8c6f0..638ea52 100644
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -48,6 +48,17 @@
- #include <stdio.h>  /* fprintf */
- #include <stdlib.h> /* getenv, rand_s */
- 
-+#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)
-+/* vs2008/9.0 and earlier lack stdint.h; _MSC_VER 1600 is vs2010/10.0 */
-+#  if defined(_WIN64)
-+typedef unsigned __int64 uintptr_t;
-+#  else
-+typedef unsigned __int32 uintptr_t;
-+#  endif
-+#else
-+#  include <stdint.h> /* uintptr_t */
-+#endif
-+
- #ifdef _WIN32
- #  define getpid GetCurrentProcessId
- #else
-@@ -121,9 +132,7 @@
- #  define XmlGetInternalEncoding XmlGetUtf16InternalEncoding
- #  define XmlGetInternalEncodingNS XmlGetUtf16InternalEncodingNS
- #  define XmlEncode XmlUtf16Encode
--/* Using pointer subtraction to convert to integer type. */
--#  define MUST_CONVERT(enc, s)                                                 \
--    (! (enc)->isUtf16 || (((char *)(s) - (char *)NULL) & 1))
-+#  define MUST_CONVERT(enc, s) (! (enc)->isUtf16 || (((uintptr_t)(s)) & 1))
- typedef unsigned short ICHAR;
- #else
- #  define XML_ENCODE_MAX XML_UTF8_ENCODE_MAX
--- 
-1.8.3.1
-