[Libreoffice-commits] core.git: external/poppler

[Michael Stahl]

 external/poppler/ubsan.patch.0 |   37 -------------------------------------
 1 file changed, 37 deletions(-)

New commits:
commit 21ca0db5ec27662a3e047d7547eae9beb87b0b01
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 3 11:13:29 2016 +0100

    poppler: remove obsolete ubsan patch hunk
    
    With eea709f67d91e271e3df37e6c6724b7b5870b1ee "poppler: build against
    libjpeg" the poppler internal JPEG code is no longer used.
    
    Change-Id: I018a53a495ec505af92bb9b1c1a0c42e0a4f35b8

diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index 575cb47..6767525 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -216,43 +216,6 @@
  
    SignatureInfo *validateSignature(bool doVerifyCert, bool forceRevalidation);
  
---- poppler/Stream.cc
-+++ poppler/Stream.cc
-@@ -2966,12 +2966,12 @@
-       } else {
- 	amp = 0;
-       }
--      data[0] += (*prevDC += amp) << scanInfo.al;
-+      data[0] += (int) ((unsigned) (*prevDC += amp) << scanInfo.al);
-     } else {
-       if ((bit = readBit()) == 9999) {
- 	return gFalse;
-       }
--      data[0] += bit << scanInfo.al;
-+      data[0] += (unsigned) bit << scanInfo.al;
-     }
-     ++i;
-   }
-@@ -3064,7 +3064,7 @@
- 	  j = dctZigZag[i++];
- 	}
-       }
--      data[j] = amp << scanInfo.al;
-+      data[j] = (unsigned) amp << scanInfo.al;
-     }
-   }
- 
-@@ -3251,8 +3251,8 @@
-     v3 = p[6];
-     v4 = (dctSqrt1d2 * (p[1] - p[7]) + 128) >> 8;
-     v7 = (dctSqrt1d2 * (p[1] + p[7]) + 128) >> 8;
--    v5 = p[3] << 4;
--    v6 = p[5] << 4;
-+    v5 = (unsigned) p[3] << 4;
-+    v6 = (unsigned) p[5] << 4;
- 
-     // stage 3
-     t = (v0 - v1+ 1) >> 1;
 --- poppler/XRef.cc
 +++ poppler/XRef.cc
 @@ -293,6 +293,7 @@