You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
2.4 KiB
82 lines
2.4 KiB
|
|
# 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) {
|
|
|