external/poppler: Work around -fsanitize=shift
Change-Id: I5d9734f302ff58637f69c1574bc39ca85ff992e7
This commit is contained in:
37
external/poppler/ubsan.patch.0
vendored
37
external/poppler/ubsan.patch.0
vendored
@@ -1,3 +1,40 @@
|
|||||||
|
--- 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
|
||||||
+++ poppler/XRef.cc
|
+++ poppler/XRef.cc
|
||||||
@@ -293,6 +293,7 @@
|
@@ -293,6 +293,7 @@
|
||||||
|
Reference in New Issue
Block a user