summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2016-09-03 17:48:23 +0200
committerMichael Palimaka <kensington@gentoo.org>2016-09-11 04:27:48 +1000
commit60961337947bcc3545af929125d2ba51909d9ee0 (patch)
treebab4f08d5f889a4b7989bb1e4585219a9b902d5f /dev-libs/expat
parentx11-themes/mate-themes: drop support for old themes versioning (diff)
downloadgentoo-60961337947bcc3545af929125d2ba51909d9ee0.tar.gz
gentoo-60961337947bcc3545af929125d2ba51909d9ee0.tar.bz2
gentoo-60961337947bcc3545af929125d2ba51909d9ee0.zip
dev-libs/expat: remove unused patches
Diffstat (limited to 'dev-libs/expat')
-rw-r--r--dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch81
-rw-r--r--dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch15
2 files changed, 0 insertions, 96 deletions
diff --git a/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch b/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch
deleted file mode 100644
index 366bd4f32b54..000000000000
--- a/dev-libs/expat/files/expat-2.1.0-mozilla-sanity-check-size.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-
-# HG changeset patch
-# User Eric Rahm <erahm@mozilla.com>
-# Date 1428706223 25200
-# Node ID 438d9e2a991ab82381a1a1442a470b2565c80c13
-# Parent 1c0861d7a6457f461cccccb2e0895a9f9d34c8d4
-Bug 1140537 - Sanity check size calculations. r=peterv
-
-diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c
---- a/parser/expat/lib/xmlparse.c
-+++ b/parser/expat/lib/xmlparse.c
-@@ -1648,29 +1648,40 @@ XML_ParseBuffer(XML_Parser parser, int l
- XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
- positionPtr = bufferPtr;
- return result;
- }
-
- void * XMLCALL
- XML_GetBuffer(XML_Parser parser, int len)
- {
-+/* BEGIN MOZILLA CHANGE (sanity check len) */
-+ if (len < 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- switch (ps_parsing) {
- case XML_SUSPENDED:
- errorCode = XML_ERROR_SUSPENDED;
- return NULL;
- case XML_FINISHED:
- errorCode = XML_ERROR_FINISHED;
- return NULL;
- default: ;
- }
-
- if (len > bufferLim - bufferEnd) {
-- /* FIXME avoid integer overflow */
- int neededSize = len + (int)(bufferEnd - bufferPtr);
-+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
-+ if (neededSize < 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- #ifdef XML_CONTEXT_BYTES
- int keep = (int)(bufferPtr - buffer);
-
- if (keep > XML_CONTEXT_BYTES)
- keep = XML_CONTEXT_BYTES;
- neededSize += keep;
- #endif /* defined XML_CONTEXT_BYTES */
- if (neededSize <= bufferLim - buffer) {
-@@ -1689,17 +1700,25 @@ XML_GetBuffer(XML_Parser parser, int len
- }
- else {
- char *newBuf;
- int bufferSize = (int)(bufferLim - bufferPtr);
- if (bufferSize == 0)
- bufferSize = INIT_BUFFER_SIZE;
- do {
- bufferSize *= 2;
-- } while (bufferSize < neededSize);
-+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */
-+ } while (bufferSize < neededSize && bufferSize > 0);
-+/* END MOZILLA CHANGE */
-+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */
-+ if (bufferSize <= 0) {
-+ errorCode = XML_ERROR_NO_MEMORY;
-+ return NULL;
-+ }
-+/* END MOZILLA CHANGE */
- newBuf = (char *)MALLOC(bufferSize);
- if (newBuf == 0) {
- errorCode = XML_ERROR_NO_MEMORY;
- return NULL;
- }
- bufferLim = newBuf + bufferSize;
- #ifdef XML_CONTEXT_BYTES
- if (bufferPtr) {
-
diff --git a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch
deleted file mode 100644
index 5ac5d54eba18..000000000000
--- a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix "xmlwf -h" output
-
-Patch is from: http://pkgs.fedoraproject.org/cgit/expat.git/plain/expat-2.1.0-xmlwfargs.patch
-
---- xmlwf/xmlwf.c
-+++ xmlwf/xmlwf.c
-@@ -634,7 +634,7 @@ static void
- usage(const XML_Char *prog, int rc)
- {
- ftprintf(stderr,
-- T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] "
-+ T("usage: %s [-s] [-n] [-p] [-x] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [-v] "
- "[-e encoding] file ...\n"), prog);
- exit(rc);
- }