summaryrefslogtreecommitdiff
path: root/poppler
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2005-12-04 18:53:40 +0000
committerAlbert Astals Cid <aacid@kde.org>2005-12-04 18:53:40 +0000
commit62345b0affed8e2e37728fca7f2b750879192c43 (patch)
tree03cbeb5e0742c8135861ad9307abc1d2764962bf /poppler
parentba4b3f88271892f197aa2ec076c80ff63a175887 (diff)
Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz for notifying
Diffstat (limited to 'poppler')
-rw-r--r--poppler/JPXStream.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/poppler/JPXStream.cc b/poppler/JPXStream.cc
index 0da6ee71..4beeb24a 100644
--- a/poppler/JPXStream.cc
+++ b/poppler/JPXStream.cc
@@ -825,8 +825,6 @@ GBool JPXStream::readCodestream(Guint len) {
return gFalse;
}
img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
- img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
- sizeof(JPXTile));
for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
sizeof(JPXTileComp));