Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,76 +0,0 @@
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
|
||||
--- a/lib/xmlparse.c
|
||||
+++ b/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) {
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 expat-2.1.0.tar.gz
|
||||
# From https://sourceforge.net/projects/expat/files/expat/2.2.0/
|
||||
md5 2f47841c829facb346eb6e3fab5212e2 expat-2.2.0.tar.bz2
|
||||
sha1 8453bc52324be4c796fd38742ec48470eef358b3 expat-2.2.0.tar.bz2
|
||||
# Calculated based on the hashes above
|
||||
sha256 d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff expat-2.2.0.tar.bz2
|
||||
|
||||
@@ -4,12 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EXPAT_VERSION = 2.1.0
|
||||
EXPAT_VERSION = 2.2.0
|
||||
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
|
||||
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
|
||||
EXPAT_INSTALL_STAGING = YES
|
||||
EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
|
||||
EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
|
||||
EXPAT_DEPENDENCIES = host-pkgconf
|
||||
HOST_EXPAT_DEPENDENCIES = host-pkgconf
|
||||
EXPAT_LICENSE = MIT
|
||||
EXPAT_LICENSE_FILES = COPYING
|
||||
|
||||
|
||||
Reference in New Issue
Block a user