Merge branch 'cve-2016-0718-fix-2-2-1'

Conflicts:
  expat/lib/xmltok.c

diff --cc expat/lib/xmlparse.c
Simple merge

diff --cc expat/lib/xmltok.c
index beb06bf71d6794f6368fe775945e069439d36814,190f16c2b593217854a48edd652d4a25b6920309..0e68844eb512265f26395cfe7509f25f97cc09f5
--- 1/expat/lib/xmltok.c
--- 2/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@@ -329,8 -329,8 +329,8 @@@ enum {  /* UTF8_cvalN is value of maske
    UTF8_cval4 = 0xf0
  };
  
- static void PTRCALL
+ static enum XML_Convert_Result PTRCALL
 -utf8_toUtf8(const ENCODING *enc,
 +utf8_toUtf8(const ENCODING *UNUSED_P(enc),
              const char **fromP, const char *fromLim,
              char **toP, const char *toLim)
  {
@@@ -436,8 -459,8 +459,8 @@@ static const struct normal_encoding int
    STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
  };
  
- static void PTRCALL
+ static enum XML_Convert_Result PTRCALL
 -latin1_toUtf8(const ENCODING *enc,
 +latin1_toUtf8(const ENCODING *UNUSED_P(enc),
                const char **fromP, const char *fromLim,
                char **toP, const char *toLim)
  {
@@@ -461,8 -484,8 +484,8 @@@
    }
  }
  
- static void PTRCALL
+ static enum XML_Convert_Result PTRCALL
 -latin1_toUtf16(const ENCODING *enc,
 +latin1_toUtf16(const ENCODING *UNUSED_P(enc),
                 const char **fromP, const char *fromLim,
                 unsigned short **toP, const unsigned short *toLim)
  {
@@@ -494,8 -522,8 +522,8 @@@ static const struct normal_encoding lat
    STANDARD_VTABLE(sb_) NULL_VTABLE
  };
  
- static void PTRCALL
+ static enum XML_Convert_Result PTRCALL
 -ascii_toUtf8(const ENCODING *enc,
 +ascii_toUtf8(const ENCODING *UNUSED_P(enc),
               const char **fromP, const char *fromLim,
               char **toP, const char *toLim)
  {
@@@ -547,8 -580,8 +580,8 @@@ unicode_byte_type(char hi, char lo
  }
  
  #define DEFINE_UTF16_TO_UTF8(E) \
- static void  PTRCALL \
+ static enum XML_Convert_Result  PTRCALL \
 -E ## toUtf8(const ENCODING *enc, \
 +E ## toUtf8(const ENCODING *UNUSED_P(enc), \
              const char **fromP, const char *fromLim, \
              char **toP, const char *toLim) \
  { \
@@@ -610,8 -652,8 +652,8 @@@
  }
  
  #define DEFINE_UTF16_TO_UTF16(E) \
- static void  PTRCALL \
+ static enum XML_Convert_Result  PTRCALL \
 -E ## toUtf16(const ENCODING *enc, \
 +E ## toUtf16(const ENCODING *UNUSED_P(enc), \
               const char **fromP, const char *fromLim, \
               unsigned short **toP, const unsigned short *toLim) \
  { \

diff --cc expat/lib/xmltok_impl.c
Simple merge