Bump to expat 2.2.0

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] security patch
[Cause & Measure] security patch
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I97518918d5c17d633ef63c3619a86f0551b90e54
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/lib/expat.h b/lib/expat.h
index c1e7406..086e24b 100644 (file)
--- a/lib/expat.h
+++ b/lib/expat.h
@@ -973,9 +973,12 @@ XML_FreeContentModel(XML_Parser parser, XML_Content *model);
 
 /* Exposing the memory handling functions used in Expat */
 XMLPARSEAPI(void *)
+XML_ATTR_MALLOC
+XML_ATTR_ALLOC_SIZE(2)
 XML_MemMalloc(XML_Parser parser, size_t size);
 
 XMLPARSEAPI(void *)
+XML_ATTR_ALLOC_SIZE(3)
 XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
 
 XMLPARSEAPI(void)

diff --git a/lib/expat_external.h b/lib/expat_external.h
index 2c03284..aa08a2f 100644 (file)
--- a/lib/expat_external.h
+++ b/lib/expat_external.h
@@ -65,12 +65,26 @@
 #endif
 #endif  /* not defined XML_STATIC */
 
+#if !defined(XMLIMPORT) && defined(__GNUC__) && (__GNUC__ >= 4)
+#define XMLIMPORT __attribute__ ((visibility ("default")))
+#endif
 
 /* If we didn't define it above, define it away: */
 #ifndef XMLIMPORT
 #define XMLIMPORT
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#define XML_ATTR_MALLOC __attribute__((__malloc__))
+#else
+#define XML_ATTR_MALLOC
+#endif
+
+#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#define XML_ATTR_ALLOC_SIZE(x)  __attribute__((__alloc_size__(x)))
+#else
+#define XML_ATTR_ALLOC_SIZE(x)
+#endif
 
 #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
 

diff --git a/packaging/expat.spec b/packaging/expat.spec
index 2649a92..9d28066 100644 (file)
--- a/packaging/expat.spec
+++ b/packaging/expat.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:           expat
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Url:            http://expat.sourceforge.net/
 Summary:        XML Parser Toolkit