From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Expat upate and regression fix for core-updates Date: Mon, 12 Sep 2016 22:03:40 -0400 Message-ID: <20160913020340.GA22383@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="FkmkrVfFsRoUs1wW" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjd52-0004c3-OT for guix-devel@gnu.org; Mon, 12 Sep 2016 22:04:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjd4x-0002R1-6H for guix-devel@gnu.org; Mon, 12 Sep 2016 22:04:11 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjd4t-0002OQ-KG for guix-devel@gnu.org; Mon, 12 Sep 2016 22:04:07 -0400 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 55FC3F29CC for ; Mon, 12 Sep 2016 22:03:52 -0400 (EDT) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --FkmkrVfFsRoUs1wW Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This updates Expat to the latest release, 2.2.0, and applies the upstream patch for a regression caused by the fix for CVE-2016-0718. It's the same patch that I sent earlier in a patch for the master branch. --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-expat-Update-to-2.2.0.patch" Content-Transfer-Encoding: quoted-printable =46rom 69611d71dc4718040bc7bc55117bd2705bad4612 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Mon, 12 Sep 2016 13:26:51 -0400 Subject: [PATCH] gnu: expat: Update to 2.2.0. * gnu/packages/xml.scm (expat): Update to 2.2.0. [source]: Use 'expat-CVE-2016-0718-fix-regression.patch'. Remove obsolete patches. * gnu/packages/patches/expat-CVE-2016-0718-fix-regression.patch: New file. * gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch, gnu/packages/patches/expat-CVE-2015-1283-refix.patch, gnu/packages/patches/expat-CVE-2016-0718.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Add and remove patches. --- gnu/local.mk | 4 +- .../expat-CVE-2012-6702-and-CVE-2016-5300.patch | 142 ---- .../patches/expat-CVE-2015-1283-refix.patch | 39 -- .../expat-CVE-2016-0718-fix-regression.patch | 35 + gnu/packages/patches/expat-CVE-2016-0718.patch | 761 -----------------= ---- gnu/packages/xml.scm | 9 +- 6 files changed, 40 insertions(+), 950 deletions(-) delete mode 100644 gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5= 300.patch delete mode 100644 gnu/packages/patches/expat-CVE-2015-1283-refix.patch create mode 100644 gnu/packages/patches/expat-CVE-2016-0718-fix-regression= =2Epatch delete mode 100644 gnu/packages/patches/expat-CVE-2016-0718.patch diff --git a/gnu/local.mk b/gnu/local.mk index 58be68f..8247e8b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -495,9 +495,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ - %D%/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch \ - %D%/packages/patches/expat-CVE-2015-1283-refix.patch \ - %D%/packages/patches/expat-CVE-2016-0718.patch \ + %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ %D%/packages/patches/fasthenry-spAllocate.patch \ diff --git a/gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.pat= ch b/gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch deleted file mode 100644 index edc43f8..0000000 --- a/gnu/packages/patches/expat-CVE-2012-6702-and-CVE-2016-5300.patch +++ /dev/null @@ -1,142 +0,0 @@ -Fix CVE-2012-6702 and CVE-2016-5300. - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-2012-6702 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-2016-5300 - -Patch copied from: -https://sources.debian.net/src/expat/2.1.0-6%2Bdeb8u3/debian/patches/cve-2= 012-6702-plus-cve-2016-5300-v1.patch/ - -From cb31522769d11a375078a073cba94e7176cb48a4 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Wed, 16 Mar 2016 15:30:12 +0100 -Subject: [PATCH] Resolve call to srand, use more entropy (patch version 1.= 0) - -Squashed backport against vanilla Expat 2.1.1, addressing: -* CVE-2012-6702 -- unanticipated internal calls to srand -* CVE-2016-5300 -- use of too little entropy - -Since commit e3e81a6d9f0885ea02d3979151c358f314bf3d6d -(released with Expat 2.1.0) Expat called srand by itself -from inside generate_hash_secret_salt for an instance -of XML_Parser if XML_SetHashSalt was either (a) not called -for that instance or if (b) salt 0 was passed to XML_SetHashSalt -prior to parsing. That call to srand passed (rather litle) -entropy extracted from the current time as a seed for srand. - -That call to srand (1) broke repeatability for code calling -srand with a non-random seed prior to parsing with Expat, -and (2) resulted in a rather small set of hashing salts in -Expat in total. - -For a short- to mid-term fix, the new approach avoids calling -srand altogether, extracts more entropy out of the clock and -other sources, too. - -For a long term fix, we may want to read sizeof(long) bytes -from a source like getrandom(..) on Linux, and from similar -sources on other supported architectures. - -https://bugzilla.redhat.com/show_bug.cgi?id=3D1197087 ---- - CMakeLists.txt | 3 +++ - lib/xmlparse.c | 48 +++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 44 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 353627e..524d514 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,9 @@ include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_D= IR}/lib) - if(MSVC)=0D - add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)=0D - endif(MSVC)=0D -+if(WIN32)=0D -+ add_definitions(-DCOMPILED_FROM_DSP)=0D -+endif(WIN32)=0D - =0D - set(expat_SRCS=0D - lib/xmlparse.c=0D -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index e308c79..c5f942f 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -6,7 +6,14 @@ - #include /* memset(), memcpy() */ - #include - #include /* UINT_MAX */ --#include /* time() */ -+ -+#ifdef COMPILED_FROM_DSP -+#define getpid GetCurrentProcessId -+#else -+#include /* gettimeofday() */ -+#include /* getpid() */ -+#include /* getpid() */ -+#endif -=20 - #define XML_BUILDING_EXPAT 1 -=20 -@@ -432,7 +439,7 @@ static ELEMENT_TYPE * - getElementType(XML_Parser parser, const ENCODING *enc, - const char *ptr, const char *end); -=20 --static unsigned long generate_hash_secret_salt(void); -+static unsigned long generate_hash_secret_salt(XML_Parser parser); - static XML_Bool startParsing(XML_Parser parser); -=20 - static XML_Parser -@@ -691,11 +698,38 @@ static const XML_Char implicitContext[] =3D { - }; -=20 - static unsigned long --generate_hash_secret_salt(void) -+gather_time_entropy(void) - { -- unsigned int seed =3D time(NULL) % UINT_MAX; -- srand(seed); -- return rand(); -+#ifdef COMPILED_FROM_DSP -+ FILETIME ft; -+ GetSystemTimeAsFileTime(&ft); /* never fails */ -+ return ft.dwHighDateTime ^ ft.dwLowDateTime; -+#else -+ struct timeval tv; -+ int gettimeofday_res; -+ -+ gettimeofday_res =3D gettimeofday(&tv, NULL); -+ assert (gettimeofday_res =3D=3D 0); -+ -+ /* Microseconds time is <20 bits entropy */ -+ return tv.tv_usec; -+#endif -+} -+ -+static unsigned long -+generate_hash_secret_salt(XML_Parser parser) -+{ -+ /* Process ID is 0 bits entropy if attacker has local access -+ * XML_Parser address is few bits of entropy if attacker has local acce= ss */ -+ const unsigned long entropy =3D -+ gather_time_entropy() ^ getpid() ^ (unsigned long)parser; -+ -+ /* Factors are 2^31-1 and 2^61-1 (Mersenne primes M31 and M61) */ -+ if (sizeof(unsigned long) =3D=3D 4) { -+ return entropy * 2147483647; -+ } else { -+ return entropy * 2305843009213693951; -+ } - } -=20 - static XML_Bool /* only valid for root parser */ -@@ -703,7 +737,7 @@ startParsing(XML_Parser parser) - { - /* hash functions must be initialized before setContext() is called */ - if (hash_secret_salt =3D=3D 0) -- hash_secret_salt =3D generate_hash_secret_salt(); -+ hash_secret_salt =3D generate_hash_secret_salt(parser); - if (ns) { - /* implicit context only set for root parser, since child - parsers (i.e. external entity parsers) will inherit it ---=20 -2.8.2 - diff --git a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch b/gnu/pac= kages/patches/expat-CVE-2015-1283-refix.patch deleted file mode 100644 index fc8d629..0000000 --- a/gnu/packages/patches/expat-CVE-2015-1283-refix.patch +++ /dev/null @@ -1,39 +0,0 @@ -Follow-up upstream fix for CVE-2015-1283 to not rely on undefined -behavior. - -Adapted from a patch from Debian (found in Debian package version -2.1.0-6+deb8u2) to apply to upstream code: - -https://sources.debian.net/src/expat/2.1.0-6%2Bdeb8u2/debian/patches/CVE-2= 015-1283-refix.patch/ - ---- - lib/xmlparse.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index 0f6f4cd..5c70c17 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -1727,7 +1727,8 @@ XML_GetBuffer(XML_Parser parser, int len) - } -=20 - if (len > bufferLim - bufferEnd) { -- int neededSize =3D len + (int)(bufferEnd - bufferPtr); -+ /* Do not invoke signed arithmetic overflow: */ -+ int neededSize =3D (int) ((unsigned)len + (unsigned)(bufferEnd - buff= erPtr)); - if (neededSize < 0) { - errorCode =3D XML_ERROR_NO_MEMORY; - return NULL; -@@ -1759,7 +1760,8 @@ XML_GetBuffer(XML_Parser parser, int len) - if (bufferSize =3D=3D 0) - bufferSize =3D INIT_BUFFER_SIZE; - do { -- bufferSize *=3D 2; -+ /* Do not invoke signed arithmetic overflow: */ -+ bufferSize =3D (int) (2U * (unsigned) bufferSize); - } while (bufferSize < neededSize && bufferSize > 0); - if (bufferSize <=3D 0) { - errorCode =3D XML_ERROR_NO_MEMORY; ---=20 -2.8.3 - diff --git a/gnu/packages/patches/expat-CVE-2016-0718-fix-regression.patch = b/gnu/packages/patches/expat-CVE-2016-0718-fix-regression.patch new file mode 100644 index 0000000..b489401 --- /dev/null +++ b/gnu/packages/patches/expat-CVE-2016-0718-fix-regression.patch @@ -0,0 +1,35 @@ +Fix regression caused by fix for CVE-2016-0718 when building with -DXML_UN= ICODE. + +Discussion: + +https://sourceforge.net/p/expat/bugs/539/ + +Patch copied from upstream source repository: + +https://sourceforge.net/p/expat/code_git/ci/af507cef2c93cb8d40062a0abe43a4= f4e9158fb2/ + +From af507cef2c93cb8d40062a0abe43a4f4e9158fb2 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 17 Jul 2016 20:22:29 +0200 +Subject: [PATCH 1/2] Fix regression bug #539 (needs -DXML_UNICODE) + +Thanks to Andy Wang and Karl Waclawek! +--- + expat/lib/xmlparse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index b308e67..0d5dd7b 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -2468,7 +2468,7 @@ doContent(XML_Parser parser, + &fromPtr, rawNameEnd, + (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); + convLen =3D (int)(toPtr - (XML_Char *)tag->buf); +- if ((convert_res =3D=3D XML_CONVERT_COMPLETED) || (convert_re= s =3D=3D XML_CONVERT_INPUT_INCOMPLETE)) { ++ if ((fromPtr >=3D rawNameEnd) || (convert_res =3D=3D XML_CONV= ERT_INPUT_INCOMPLETE)) { + tag->name.strLen =3D convLen; + break; + } +--=20 +2.10.0 diff --git a/gnu/packages/patches/expat-CVE-2016-0718.patch b/gnu/packages/= patches/expat-CVE-2016-0718.patch deleted file mode 100644 index 22436c2..0000000 --- a/gnu/packages/patches/expat-CVE-2016-0718.patch +++ /dev/null @@ -1,761 +0,0 @@ -Fix CVE-2016-0718. - -Copied from Debian, as found in Debian package version 2.1.0-6+deb8u2. - -https://sources.debian.net/src/expat/2.1.0-6%2Bdeb8u2/debian/patches/CVE-2= 016-0718-v2-2-1.patch/ - -From cdfcb1b5c95e93b00ae9e9d25708b4a3bee72c15 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 2 May 2016 00:02:44 +0200 -Subject: [PATCH] Address CVE-2016-0718 (/patch/ version 2.2.1) - -* Out of bounds memory access when doing text conversion on malformed input -* Integer overflow related to memory allocation - -Reported by Gustavo Grieco - -Patch credits go to -* Christian Heimes -* Karl Waclawek -* Gustavo Grieco -* Sebastian Pipping -* Pascal Cuoq ---- - expat/lib/xmlparse.c | 34 +++++++++----- - expat/lib/xmltok.c | 115 +++++++++++++++++++++++++++++++++++--------= ----- - expat/lib/xmltok.h | 10 ++++- - expat/lib/xmltok_impl.c | 62 +++++++++++++------------- - 4 files changed, 146 insertions(+), 75 deletions(-) - -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index e308c79..13e080d 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -2436,11 +2436,11 @@ doContent(XML_Parser parser, - for (;;) { - int bufSize; - int convLen; -- XmlConvert(enc, -+ const enum XML_Convert_Result convert_res =3D XmlConvert(enc, - &fromPtr, rawNameEnd, - (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - convLen =3D (int)(toPtr - (XML_Char *)tag->buf); -- if (fromPtr =3D=3D rawNameEnd) { -+ if ((convert_res =3D=3D XML_CONVERT_COMPLETED) || (convert_re= s =3D=3D XML_CONVERT_INPUT_INCOMPLETE)) { - tag->name.strLen =3D convLen; - break; - } -@@ -2661,11 +2661,11 @@ doContent(XML_Parser parser, - if (MUST_CONVERT(enc, s)) { - for (;;) { - ICHAR *dataPtr =3D (ICHAR *)dataBuf; -- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); -+ const enum XML_Convert_Result convert_res =3D XmlConvert(en= c, &s, next, &dataPtr, (ICHAR *)dataBufEnd); - *eventEndPP =3D s; - charDataHandler(handlerArg, dataBuf, - (int)(dataPtr - (ICHAR *)dataBuf)); -- if (s =3D=3D next) -+ if ((convert_res =3D=3D XML_CONVERT_COMPLETED) || (convert_= res =3D=3D XML_CONVERT_INPUT_INCOMPLETE)) - break; - *eventPP =3D s; - } -@@ -3269,11 +3269,11 @@ doCdataSection(XML_Parser parser, - if (MUST_CONVERT(enc, s)) { - for (;;) { - ICHAR *dataPtr =3D (ICHAR *)dataBuf; -- XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); -+ const enum XML_Convert_Result convert_res =3D XmlConvert(en= c, &s, next, &dataPtr, (ICHAR *)dataBufEnd); - *eventEndPP =3D next; - charDataHandler(handlerArg, dataBuf, - (int)(dataPtr - (ICHAR *)dataBuf)); -- if (s =3D=3D next) -+ if ((convert_res =3D=3D XML_CONVERT_COMPLETED) || (convert_= res =3D=3D XML_CONVERT_INPUT_INCOMPLETE)) - break; - *eventPP =3D s; - } -@@ -5350,6 +5350,7 @@ reportDefault(XML_Parser parser, const ENCODING *enc, - const char *s, const char *end) - { - if (MUST_CONVERT(enc, s)) { -+ enum XML_Convert_Result convert_res; - const char **eventPP; - const char **eventEndPP; - if (enc =3D=3D encoding) { -@@ -5362,11 +5363,11 @@ reportDefault(XML_Parser parser, const ENCODING *e= nc, - } - do { - ICHAR *dataPtr =3D (ICHAR *)dataBuf; -- XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); -+ convert_res =3D XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBuf= End); - *eventEndPP =3D s; - defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBu= f)); - *eventPP =3D s; -- } while (s !=3D end); -+ } while ((convert_res !=3D XML_CONVERT_COMPLETED) && (convert_res != =3D XML_CONVERT_INPUT_INCOMPLETE)); - } - else - defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XM= L_Char *)s)); -@@ -6169,8 +6170,8 @@ poolAppend(STRING_POOL *pool, const ENCODING *enc, - if (!pool->ptr && !poolGrow(pool)) - return NULL; - for (;;) { -- XmlConvert(enc, &ptr, end, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end= ); -- if (ptr =3D=3D end) -+ const enum XML_Convert_Result convert_res =3D XmlConvert(enc, &ptr, e= nd, (ICHAR **)&(pool->ptr), (ICHAR *)pool->end); -+ if ((convert_res =3D=3D XML_CONVERT_COMPLETED) || (convert_res =3D=3D= XML_CONVERT_INPUT_INCOMPLETE)) - break; - if (!poolGrow(pool)) - return NULL; -@@ -6254,8 +6255,13 @@ poolGrow(STRING_POOL *pool) - } - } - if (pool->blocks && pool->start =3D=3D pool->blocks->s) { -- int blockSize =3D (int)(pool->end - pool->start)*2; -- BLOCK *temp =3D (BLOCK *) -+ BLOCK *temp; -+ int blockSize =3D (int)((unsigned)(pool->end - pool->start)*2U); -+ -+ if (blockSize < 0) -+ return XML_FALSE; -+ -+ temp =3D (BLOCK *) - pool->mem->realloc_fcn(pool->blocks, - (offsetof(BLOCK, s) - + blockSize * sizeof(XML_Char))); -@@ -6270,6 +6276,10 @@ poolGrow(STRING_POOL *pool) - else { - BLOCK *tem; - int blockSize =3D (int)(pool->end - pool->start); -+ -+ if (blockSize < 0) -+ return XML_FALSE; -+ - if (blockSize < INIT_BLOCK_SIZE) - blockSize =3D INIT_BLOCK_SIZE; - else -diff --git a/lib/xmltok.c b/lib/xmltok.c -index bf09dfc..cb98ce1 100644 ---- a/lib/xmltok.c -+++ b/lib/xmltok.c -@@ -318,39 +318,55 @@ enum { /* UTF8_cvalN is value of masked first byte = of N byte sequence */ - UTF8_cval4 =3D 0xf0 - }; -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - utf8_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) - { -+ enum XML_Convert_Result res =3D XML_CONVERT_COMPLETED; - char *to; - const char *from; - if (fromLim - *fromP > toLim - *toP) { - /* Avoid copying partial characters. */ -+ res =3D XML_CONVERT_OUTPUT_EXHAUSTED; - for (fromLim =3D *fromP + (toLim - *toP); fromLim > *fromP; fromLim--) - if (((unsigned char)fromLim[-1] & 0xc0) !=3D 0x80) - break; - } -- for (to =3D *toP, from =3D *fromP; from !=3D fromLim; from++, to++) -+ for (to =3D *toP, from =3D *fromP; (from < fromLim) && (to < toLim); fr= om++, to++) - *to =3D *from; - *fromP =3D from; - *toP =3D to; -+ -+ if ((to =3D=3D toLim) && (from < fromLim)) -+ return XML_CONVERT_OUTPUT_EXHAUSTED; -+ else -+ return res; - } -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - utf8_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) - { -+ enum XML_Convert_Result res =3D XML_CONVERT_COMPLETED; - unsigned short *to =3D *toP; - const char *from =3D *fromP; -- while (from !=3D fromLim && to !=3D toLim) { -+ while (from < fromLim && to < toLim) { - switch (((struct normal_encoding *)enc)->type[(unsigned char)*from]) { - case BT_LEAD2: -+ if (fromLim - from < 2) { -+ res =3D XML_CONVERT_INPUT_INCOMPLETE; -+ break; -+ } - *to++ =3D (unsigned short)(((from[0] & 0x1f) << 6) | (from[1] & 0x3= f)); - from +=3D 2; - break; - case BT_LEAD3: -+ if (fromLim - from < 3) { -+ res =3D XML_CONVERT_INPUT_INCOMPLETE; -+ break; -+ } - *to++ =3D (unsigned short)(((from[0] & 0xf) << 12) - | ((from[1] & 0x3f) << 6) | (from[2] & 0x3= f)); - from +=3D 3; -@@ -358,8 +374,14 @@ utf8_toUtf16(const ENCODING *enc, - case BT_LEAD4: - { - unsigned long n; -- if (to + 1 =3D=3D toLim) -+ if (toLim - to < 2) { -+ res =3D XML_CONVERT_OUTPUT_EXHAUSTED; - goto after; -+ } -+ if (fromLim - from < 4) { -+ res =3D XML_CONVERT_INPUT_INCOMPLETE; -+ goto after; -+ } - n =3D ((from[0] & 0x7) << 18) | ((from[1] & 0x3f) << 12) - | ((from[2] & 0x3f) << 6) | (from[3] & 0x3f); - n -=3D 0x10000; -@@ -377,6 +399,7 @@ utf8_toUtf16(const ENCODING *enc, - after: - *fromP =3D from; - *toP =3D to; -+ return res; - } -=20 - #ifdef XML_NS -@@ -425,7 +448,7 @@ static const struct normal_encoding internal_utf8_enco= ding =3D { - STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_) - }; -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - latin1_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) -@@ -433,30 +456,35 @@ latin1_toUtf8(const ENCODING *enc, - for (;;) { - unsigned char c; - if (*fromP =3D=3D fromLim) -- break; -+ return XML_CONVERT_COMPLETED; - c =3D (unsigned char)**fromP; - if (c & 0x80) { - if (toLim - *toP < 2) -- break; -+ return XML_CONVERT_OUTPUT_EXHAUSTED; - *(*toP)++ =3D (char)((c >> 6) | UTF8_cval2); - *(*toP)++ =3D (char)((c & 0x3f) | 0x80); - (*fromP)++; - } - else { - if (*toP =3D=3D toLim) -- break; -+ return XML_CONVERT_OUTPUT_EXHAUSTED; - *(*toP)++ =3D *(*fromP)++; - } - } - } -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - latin1_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) - { -- while (*fromP !=3D fromLim && *toP !=3D toLim) -+ while (*fromP < fromLim && *toP < toLim) - *(*toP)++ =3D (unsigned char)*(*fromP)++; -+ -+ if ((*toP =3D=3D toLim) && (*fromP < fromLim)) -+ return XML_CONVERT_OUTPUT_EXHAUSTED; -+ else -+ return XML_CONVERT_COMPLETED; - } -=20 - #ifdef XML_NS -@@ -483,13 +511,18 @@ static const struct normal_encoding latin1_encoding = =3D { - STANDARD_VTABLE(sb_) - }; -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - ascii_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) - { -- while (*fromP !=3D fromLim && *toP !=3D toLim) -+ while (*fromP < fromLim && *toP < toLim) - *(*toP)++ =3D *(*fromP)++; -+ -+ if ((*toP =3D=3D toLim) && (*fromP < fromLim)) -+ return XML_CONVERT_OUTPUT_EXHAUSTED; -+ else -+ return XML_CONVERT_COMPLETED; - } -=20 - #ifdef XML_NS -@@ -536,13 +569,14 @@ unicode_byte_type(char hi, char lo) - } -=20 - #define DEFINE_UTF16_TO_UTF8(E) \ --static void PTRCALL \ -+static enum XML_Convert_Result PTRCALL \ - E ## toUtf8(const ENCODING *enc, \ - const char **fromP, const char *fromLim, \ - char **toP, const char *toLim) \ - { \ -- const char *from; \ -- for (from =3D *fromP; from !=3D fromLim; from +=3D 2) { \ -+ const char *from =3D *fromP; \ -+ fromLim =3D from + (((fromLim - from) >> 1) << 1); /* shrink to even *= / \ -+ for (; from < fromLim; from +=3D 2) { \ - int plane; \ - unsigned char lo2; \ - unsigned char lo =3D GET_LO(from); \ -@@ -552,7 +586,7 @@ E ## toUtf8(const ENCODING *enc, \ - if (lo < 0x80) { \ - if (*toP =3D=3D toLim) { \ - *fromP =3D from; \ -- return; \ -+ return XML_CONVERT_OUTPUT_EXHAUSTED; \ - } \ - *(*toP)++ =3D lo; \ - break; \ -@@ -562,7 +596,7 @@ E ## toUtf8(const ENCODING *enc, \ - case 0x4: case 0x5: case 0x6: case 0x7: \ - if (toLim - *toP < 2) { \ - *fromP =3D from; \ -- return; \ -+ return XML_CONVERT_OUTPUT_EXHAUSTED; \ - } \ - *(*toP)++ =3D ((lo >> 6) | (hi << 2) | UTF8_cval2); \ - *(*toP)++ =3D ((lo & 0x3f) | 0x80); \ -@@ -570,7 +604,7 @@ E ## toUtf8(const ENCODING *enc, \ - default: \ - if (toLim - *toP < 3) { \ - *fromP =3D from; \ -- return; \ -+ return XML_CONVERT_OUTPUT_EXHAUSTED; \ - } \ - /* 16 bits divided 4, 6, 6 amongst 3 bytes */ \ - *(*toP)++ =3D ((hi >> 4) | UTF8_cval3); \ -@@ -580,7 +614,11 @@ E ## toUtf8(const ENCODING *enc, \ - case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ - if (toLim - *toP < 4) { \ - *fromP =3D from; \ -- return; \ -+ return XML_CONVERT_OUTPUT_EXHAUSTED; \ -+ } \ -+ if (fromLim - from < 4) { \ -+ *fromP =3D from; \ -+ return XML_CONVERT_INPUT_INCOMPLETE; \ - } \ - plane =3D (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \ - *(*toP)++ =3D ((plane >> 2) | UTF8_cval4); \ -@@ -596,20 +634,32 @@ E ## toUtf8(const ENCODING *enc, \ - } \ - } \ - *fromP =3D from; \ -+ if (from < fromLim) \ -+ return XML_CONVERT_INPUT_INCOMPLETE; \ -+ else \ -+ return XML_CONVERT_COMPLETED; \ - } -=20 - #define DEFINE_UTF16_TO_UTF16(E) \ --static void PTRCALL \ -+static enum XML_Convert_Result PTRCALL \ - E ## toUtf16(const ENCODING *enc, \ - const char **fromP, const char *fromLim, \ - unsigned short **toP, const unsigned short *toLim) \ - { \ -+ enum XML_Convert_Result res =3D XML_CONVERT_COMPLETED; \ -+ fromLim =3D *fromP + (((fromLim - *fromP) >> 1) << 1); /* shrink to ev= en */ \ - /* Avoid copying first half only of surrogate */ \ - if (fromLim - *fromP > ((toLim - *toP) << 1) \ -- && (GET_HI(fromLim - 2) & 0xF8) =3D=3D 0xD8) \ -+ && (GET_HI(fromLim - 2) & 0xF8) =3D=3D 0xD8) { \ - fromLim -=3D 2; \ -- for (; *fromP !=3D fromLim && *toP !=3D toLim; *fromP +=3D 2) \ -+ res =3D XML_CONVERT_INPUT_INCOMPLETE; \ -+ } \ -+ for (; *fromP < fromLim && *toP < toLim; *fromP +=3D 2) \ - *(*toP)++ =3D (GET_HI(*fromP) << 8) | GET_LO(*fromP); \ -+ if ((*toP =3D=3D toLim) && (*fromP < fromLim)) \ -+ return XML_CONVERT_OUTPUT_EXHAUSTED; \ -+ else \ -+ return res; \ - } -=20 - #define SET2(ptr, ch) \ -@@ -1288,7 +1338,7 @@ unknown_isInvalid(const ENCODING *enc, const char *p) - return (c & ~0xFFFF) || checkCharRefNumber(c) < 0; - } -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - unknown_toUtf8(const ENCODING *enc, - const char **fromP, const char *fromLim, - char **toP, const char *toLim) -@@ -1299,21 +1349,21 @@ unknown_toUtf8(const ENCODING *enc, - const char *utf8; - int n; - if (*fromP =3D=3D fromLim) -- break; -+ return XML_CONVERT_COMPLETED; - utf8 =3D uenc->utf8[(unsigned char)**fromP]; - n =3D *utf8++; - if (n =3D=3D 0) { - int c =3D uenc->convert(uenc->userData, *fromP); - n =3D XmlUtf8Encode(c, buf); - if (n > toLim - *toP) -- break; -+ return XML_CONVERT_OUTPUT_EXHAUSTED; - utf8 =3D buf; - *fromP +=3D (AS_NORMAL_ENCODING(enc)->type[(unsigned char)**fromP] - - (BT_LEAD2 - 2)); - } - else { - if (n > toLim - *toP) -- break; -+ return XML_CONVERT_OUTPUT_EXHAUSTED; - (*fromP)++; - } - do { -@@ -1322,13 +1372,13 @@ unknown_toUtf8(const ENCODING *enc, - } - } -=20 --static void PTRCALL -+static enum XML_Convert_Result PTRCALL - unknown_toUtf16(const ENCODING *enc, - const char **fromP, const char *fromLim, - unsigned short **toP, const unsigned short *toLim) - { - const struct unknown_encoding *uenc =3D AS_UNKNOWN_ENCODING(enc); -- while (*fromP !=3D fromLim && *toP !=3D toLim) { -+ while (*fromP < fromLim && *toP < toLim) { - unsigned short c =3D uenc->utf16[(unsigned char)**fromP]; - if (c =3D=3D 0) { - c =3D (unsigned short) -@@ -1340,6 +1390,11 @@ unknown_toUtf16(const ENCODING *enc, - (*fromP)++; - *(*toP)++ =3D c; - } -+ -+ if ((*toP =3D=3D toLim) && (*fromP < fromLim)) -+ return XML_CONVERT_OUTPUT_EXHAUSTED; -+ else -+ return XML_CONVERT_COMPLETED; - } -=20 - ENCODING * -@@ -1503,7 +1558,7 @@ initScan(const ENCODING * const *encodingTable, - { - const ENCODING **encPtr; -=20 -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - encPtr =3D enc->encPtr; - if (ptr + 1 =3D=3D end) { -diff --git a/lib/xmltok.h b/lib/xmltok.h -index ca867aa..752007e 100644 ---- a/lib/xmltok.h -+++ b/lib/xmltok.h -@@ -130,6 +130,12 @@ typedef int (PTRCALL *SCANNER)(const ENCODING *, - const char *, - const char **); -=20 -+enum XML_Convert_Result { -+ XML_CONVERT_COMPLETED =3D 0, -+ XML_CONVERT_INPUT_INCOMPLETE =3D 1, -+ XML_CONVERT_OUTPUT_EXHAUSTED =3D 2 /* and therefore potentially input = remaining as well */ -+}; -+ - struct encoding { - SCANNER scanners[XML_N_STATES]; - SCANNER literalScanners[XML_N_LITERAL_TYPES]; -@@ -158,12 +164,12 @@ struct encoding { - const char *ptr, - const char *end, - const char **badPtr); -- void (PTRCALL *utf8Convert)(const ENCODING *enc, -+ enum XML_Convert_Result (PTRCALL *utf8Convert)(const ENCODING *enc, - const char **fromP, - const char *fromLim, - char **toP, - const char *toLim); -- void (PTRCALL *utf16Convert)(const ENCODING *enc, -+ enum XML_Convert_Result (PTRCALL *utf16Convert)(const ENCODING *enc, - const char **fromP, - const char *fromLim, - unsigned short **toP, -diff --git a/lib/xmltok_impl.c b/lib/xmltok_impl.c -index 9c2895b..6c5a3ba 100644 ---- a/lib/xmltok_impl.c -+++ b/lib/xmltok_impl.c -@@ -93,13 +93,13 @@ static int PTRCALL - PREFIX(scanComment)(const ENCODING *enc, const char *ptr, - const char *end, const char **nextTokPtr) - { -- if (ptr !=3D end) { -+ if (ptr < end) { - if (!CHAR_MATCHES(enc, ptr, ASCII_MINUS)) { - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } - ptr +=3D MINBPC(enc); -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - INVALID_CASES(ptr, nextTokPtr) - case BT_MINUS: -@@ -147,7 +147,7 @@ PREFIX(scanDecl)(const ENCODING *enc, const char *ptr, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_PERCNT: - if (ptr + MINBPC(enc) =3D=3D end) -@@ -233,7 +233,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_S: case BT_CR: case BT_LF: -@@ -242,7 +242,7 @@ PREFIX(scanPi)(const ENCODING *enc, const char *ptr, - return XML_TOK_INVALID; - } - ptr +=3D MINBPC(enc); -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - INVALID_CASES(ptr, nextTokPtr) - case BT_QUEST: -@@ -305,7 +305,7 @@ static int PTRCALL - PREFIX(cdataSectionTok)(const ENCODING *enc, const char *ptr, - const char *end, const char **nextTokPtr) - { -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - if (MINBPC(enc) > 1) { - size_t n =3D end - ptr; -@@ -348,7 +348,7 @@ PREFIX(cdataSectionTok)(const ENCODING *enc, const cha= r *ptr, - ptr +=3D MINBPC(enc); - break; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ -@@ -391,11 +391,11 @@ PREFIX(scanEndTag)(const ENCODING *enc, const char *= ptr, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_S: case BT_CR: case BT_LF: -- for (ptr +=3D MINBPC(enc); ptr !=3D end; ptr +=3D MINBPC(enc)) { -+ for (ptr +=3D MINBPC(enc); ptr < end; ptr +=3D MINBPC(enc)) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_S: case BT_CR: case BT_LF: - break; -@@ -432,7 +432,7 @@ static int PTRCALL - PREFIX(scanHexCharRef)(const ENCODING *enc, const char *ptr, - const char *end, const char **nextTokPtr) - { -- if (ptr !=3D end) { -+ if (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_DIGIT: - case BT_HEX: -@@ -441,7 +441,7 @@ PREFIX(scanHexCharRef)(const ENCODING *enc, const char= *ptr, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- for (ptr +=3D MINBPC(enc); ptr !=3D end; ptr +=3D MINBPC(enc)) { -+ for (ptr +=3D MINBPC(enc); ptr < end; ptr +=3D MINBPC(enc)) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_DIGIT: - case BT_HEX: -@@ -464,7 +464,7 @@ static int PTRCALL - PREFIX(scanCharRef)(const ENCODING *enc, const char *ptr, - const char *end, const char **nextTokPtr) - { -- if (ptr !=3D end) { -+ if (ptr < end) { - if (CHAR_MATCHES(enc, ptr, ASCII_x)) - return PREFIX(scanHexCharRef)(enc, ptr + MINBPC(enc), end, nextTokP= tr); - switch (BYTE_TYPE(enc, ptr)) { -@@ -474,7 +474,7 @@ PREFIX(scanCharRef)(const ENCODING *enc, const char *p= tr, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- for (ptr +=3D MINBPC(enc); ptr !=3D end; ptr +=3D MINBPC(enc)) { -+ for (ptr +=3D MINBPC(enc); ptr < end; ptr +=3D MINBPC(enc)) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_DIGIT: - break; -@@ -506,7 +506,7 @@ PREFIX(scanRef)(const ENCODING *enc, const char *ptr, = const char *end, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_SEMI: -@@ -529,7 +529,7 @@ PREFIX(scanAtts)(const ENCODING *enc, const char *ptr,= const char *end, - #ifdef XML_NS - int hadColon =3D 0; - #endif -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - #ifdef XML_NS -@@ -716,7 +716,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, c= onst char *end, - hadColon =3D 0; - #endif - /* we have a start-tag */ -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - #ifdef XML_NS -@@ -740,7 +740,7 @@ PREFIX(scanLt)(const ENCODING *enc, const char *ptr, c= onst char *end, - case BT_S: case BT_CR: case BT_LF: - { - ptr +=3D MINBPC(enc); -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) - case BT_GT: -@@ -785,7 +785,7 @@ static int PTRCALL - PREFIX(contentTok)(const ENCODING *enc, const char *ptr, const char *end, - const char **nextTokPtr) - { -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - if (MINBPC(enc) > 1) { - size_t n =3D end - ptr; -@@ -832,7 +832,7 @@ PREFIX(contentTok)(const ENCODING *enc, const char *pt= r, const char *end, - ptr +=3D MINBPC(enc); - break; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ -@@ -895,7 +895,7 @@ PREFIX(scanPercent)(const ENCODING *enc, const char *p= tr, const char *end, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_SEMI: -@@ -921,7 +921,7 @@ PREFIX(scanPoundName)(const ENCODING *enc, const char = *ptr, const char *end, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_CR: case BT_LF: case BT_S: -@@ -941,7 +941,7 @@ PREFIX(scanLit)(int open, const ENCODING *enc, - const char *ptr, const char *end, - const char **nextTokPtr) - { -- while (ptr !=3D end) { -+ while (ptr < end) { - int t =3D BYTE_TYPE(enc, ptr); - switch (t) { - INVALID_CASES(ptr, nextTokPtr) -@@ -973,7 +973,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *ptr= , const char *end, - const char **nextTokPtr) - { - int tok; -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - if (MINBPC(enc) > 1) { - size_t n =3D end - ptr; -@@ -1141,7 +1141,7 @@ PREFIX(prologTok)(const ENCODING *enc, const char *p= tr, const char *end, - *nextTokPtr =3D ptr; - return XML_TOK_INVALID; - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - CHECK_NAME_CASES(enc, ptr, end, nextTokPtr) - case BT_GT: case BT_RPAR: case BT_COMMA: -@@ -1204,10 +1204,10 @@ PREFIX(attributeValueTok)(const ENCODING *enc, con= st char *ptr, - const char *end, const char **nextTokPtr) - { - const char *start; -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - start =3D ptr; -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: ptr +=3D n; break; -@@ -1262,10 +1262,10 @@ PREFIX(entityValueTok)(const ENCODING *enc, const = char *ptr, - const char *end, const char **nextTokPtr) - { - const char *start; -- if (ptr =3D=3D end) -+ if (ptr >=3D end) - return XML_TOK_NONE; - start =3D ptr; -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: ptr +=3D n; break; -@@ -1326,7 +1326,7 @@ PREFIX(ignoreSectionTok)(const ENCODING *enc, const = char *ptr, - end =3D ptr + n; - } - } -- while (ptr !=3D end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - INVALID_CASES(ptr, nextTokPtr) - case BT_LT: -@@ -1373,7 +1373,7 @@ PREFIX(isPublicId)(const ENCODING *enc, const char *= ptr, const char *end, - { - ptr +=3D MINBPC(enc); - end -=3D MINBPC(enc); -- for (; ptr !=3D end; ptr +=3D MINBPC(enc)) { -+ for (; ptr < end; ptr +=3D MINBPC(enc)) { - switch (BYTE_TYPE(enc, ptr)) { - case BT_DIGIT: - case BT_HEX: -@@ -1760,7 +1760,7 @@ PREFIX(updatePosition)(const ENCODING *enc, - case BT_CR: - pos->lineNumber++; - ptr +=3D MINBPC(enc); -- if (ptr !=3D end && BYTE_TYPE(enc, ptr) =3D=3D BT_LF) -+ if (ptr < end && BYTE_TYPE(enc, ptr) =3D=3D BT_LF) - ptr +=3D MINBPC(enc); - pos->columnNumber =3D (XML_Size)-1; - break; ---=20 -2.8.2 - diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index a478599..bafbf42 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -49,17 +49,16 @@ (define-public expat (package (name "expat") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" version "/expat-" version ".tar.bz2")) - (patches (search-patches "expat-CVE-2012-6702-and-CVE-2016-53= 00.patch" - "expat-CVE-2015-1283-refix.patch" - "expat-CVE-2016-0718.patch")) + (patches + (search-patches "expat-CVE-2016-0718-fix-regression.patch")) (sha256 (base32 - "0ryyjgvy7jq0qb7a9mhc1giy3bzn56aiwrs8dpydqngplbjq9xdg")))) + "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr")))) (build-system gnu-build-system) (home-page "http://www.libexpat.org/") (synopsis "Stream-oriented XML parser library written in C") --=20 2.10.0 --PEIAKu/WMn1b1Hv9-- --FkmkrVfFsRoUs1wW Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX1154AAoJECZG+jC6yn8IodoQAOiS6sNalPJGmwsz84ZTuHUk 0cH6jIudwmEfLwqhX1U4GkUTnxTDoSWnfVzh0pc1eeida1SKpGdgSpe0kZfpgc7P dxxbaRq0W1vpqAavnbMKNsMPzUpSdDpSQrXr5SGQrpDtKBMAupGXMsS1f8odyg/j lRpGCTIFcV2whLMfYBPthfEMfj4PTcNjGM0GKK5s2DcofLqM0d5OCXkTgUE0C7RW Mb861idSM+Vq0N01MKpQTgPEoevWkuN2II4A67P+LfHfRmKTa8Os6M/ith+5W3br 6TlUerZy1zmYIAyyaO+ZZI053NK+/l+M6yJ0axqNnXnK35RyXZ9pTl8JZHbRbKSi q2SQ6tSNwKwJhWBzAkoj1xhtuOnqxDdpcxsiGbxjveUT6Gs1iGkPDEAxSfaZ0VE6 n8ppexV6wLOLS5ncwV9AF+dUKMVk2+s+a9jjBdVQyxbpTCYXJRLoh9rCWfD3YZJU EhJXqw/Z46X3M5rLA3XFSl4vF2DrcdBMm0wi+ucbGOPnyA13yngxyYymDQH4LTq/ 4FPNIG4DCSwmyaE/n9tfEhT4GMCobBR2lwl2TjkQ6fDFxBN5pubc15D1Actsz/b9 roIfLxcWwvBqHvnSJl9x5sIkEOyKUz1aVljixYVcGaP5QuEU5RqnpPRPDcbLn3am kgLUMcBhUmLOMXe8gYTL =F7Gr -----END PGP SIGNATURE----- --FkmkrVfFsRoUs1wW--