SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecBSD's official ports repository

Browse source
This commit is contained in:
purplerain 2023-08-16 22:26:55 +00:00
commit 2c0afcbbf3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64331 changed files with 5339189 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

47
textproc/xpdf/patches/patch-splash_SplashXPath_cc Normal file
View file

@ -0,0 +1,47 @@
Replace Miod's fix from 2009 by some assert's, because the bug
*should* have been fixed in a different way and I'm too lazy to
verify it. (needs a change to strokeAdjust(), which is private)
--- splash/SplashXPath.cc.orig Wed May 28 20:50:50 2014
+++ splash/SplashXPath.cc Fri May 30 15:31:49 2014
@@ -8,6 +8,8 @@
#include <aconf.h>
+#include <assert.h>
+
#ifdef USE_GCC_PRAGMAS
#pragma implementation
#endif
@@ -69,7 +71,7 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord
// do stroke adjustment
if (path->hints) {
- strokeAdjust(pts, path->hints, path->hintsLength);
+ strokeAdjust(pts, path->hints, path->hintsLength, path->length);
}
segs = NULL;
@@ -176,7 +178,8 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord
}
void SplashXPath::strokeAdjust(SplashXPathPoint *pts,
- SplashPathHint *hints, int nHints) {
+ SplashPathHint *hints, int nHints,
+ int plength) {
SplashXPathAdjust *adjusts, *adjust;
SplashPathHint *hint;
SplashCoord x0, y0, x1, y1, x2, y2, x3, y3;
@@ -188,9 +191,12 @@ void SplashXPath::strokeAdjust(SplashXPathPoint *pts,
adjusts = (SplashXPathAdjust *)gmallocn(nHints, sizeof(SplashXPathAdjust));
for (i = 0; i < nHints; ++i) {
hint = &hints[i];
+ assert(hint->firstPt < plength && hint->lastPt < plength);
x0 = pts[hint->ctrl0 ].x; y0 = pts[hint->ctrl0 ].y;
+ assert(hint->ctrl0 + 1 < plength);
x1 = pts[hint->ctrl0 + 1].x; y1 = pts[hint->ctrl0 + 1].y;
x2 = pts[hint->ctrl1 ].x; y2 = pts[hint->ctrl1 ].y;
+ assert(hint->ctrl1 + 1 < plength);
x3 = pts[hint->ctrl1 + 1].x; y3 = pts[hint->ctrl1 + 1].y;
if (x0 == x1 && x2 == x3) {
adjusts[i].vert = gTrue;