commit f0bec73b018caa07d3e75ec8dd967f3785d71bde
author Pascal Cuoq <cuoq@trust-in-soft.com> Sun May 15 09:05:46 2016 +0200
committer Sebastian Pipping <sebastian@pipping.org> Mon May 16 15:35:08 2016 +0200
tree 8b6eec8fb5b60f0c316a63a0f2e9ff1393668017
parent a238d7ea7a715ef3850c4cbdd86aeda7077b6bbc

Avoid relying on undefined behavior in CVE-2015-1283 fix. It does not really work: https://godbolt.org/g/Zl8gdF

expat/lib/xmlparse.c

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 7586b24..620a820 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1730,7 +1730,8 @@
 #ifdef XML_CONTEXT_BYTES
     int keep;
 #endif  /* defined XML_CONTEXT_BYTES */
-    int neededSize = len + (int)(bufferEnd - bufferPtr);
+    /* Do not invoke signed arithmetic overflow: */
+    int neededSize = (int) ((unsigned)len + (unsigned)(bufferEnd - bufferPtr));
     if (neededSize < 0) {
       errorCode = XML_ERROR_NO_MEMORY;
       return NULL;
@@ -1761,7 +1762,8 @@
       if (bufferSize == 0)
         bufferSize = INIT_BUFFER_SIZE;
       do {
-        bufferSize *= 2;
+        /* Do not invoke signed arithmetic overflow: */
+        bufferSize = (int) (2U * (unsigned) bufferSize);
       } while (bufferSize < neededSize && bufferSize > 0);
       if (bufferSize <= 0) {
         errorCode = XML_ERROR_NO_MEMORY;