ALT Linux Bugzilla
– Attachment 1293 Details for
Bug 8632
SECURITY problems: CAN-2005-2097, CVE-2005-319[1-3]
New bug
|
Search
|
[?]
|
Help
Register
|
Log In
[x]
|
Forgot Password
Login:
[x]
|
EN
|
RU
[patch]
CVE-2005-3191_2_3.patch
04_CVE-2005-3191_2_3.patch (text/plain), 4.60 KB, created by
Vladimir Lettiev
on 2005-12-13 10:10:00 MSK
(
hide
)
Description:
CVE-2005-3191_2_3.patch
Filename:
MIME Type:
Creator:
Vladimir Lettiev
Created:
2005-12-13 10:10:00 MSK
Size:
4.60 KB
patch
obsolete
>diff -Nur poppler-0.4.2/poppler/JPXStream.cc poppler-0.4.2.new/poppler/JPXStream.cc >--- poppler-0.4.2/poppler/JPXStream.cc 2005-03-03 20:46:03.000000000 +0100 >+++ poppler-0.4.2.new/poppler/JPXStream.cc 2005-12-09 17:41:42.000000000 +0100 >@@ -7,6 +7,7 @@ > //======================================================================== > > #include <config.h> >+#include <limits.h> > > #ifdef USE_GCC_PRAGMAS > #pragma implementation >@@ -666,7 +667,7 @@ > int segType; > GBool haveSIZ, haveCOD, haveQCD, haveSOT; > Guint precinctSize, style; >- Guint segLen, capabilities, comp, i, j, r; >+ Guint segLen, capabilities, nTiles, comp, i, j, r; > > //----- main header > haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; >@@ -701,8 +702,18 @@ > / img.xTileSize; > img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) > / img.yTileSize; >- img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * >- sizeof(JPXTile)); >+ // check for overflow before allocating memory >+ if (img.nXTiles <= 0 || img.nYTiles <= 0 || >+ img.nXTiles >= INT_MAX/img.nYTiles) { >+ error(getPos(), "Bad tile count in JPX SIZ marker segment"); >+ return gFalse; >+ } >+ nTiles = img.nXTiles * img.nYTiles; >+ if (nTiles >= INT_MAX/sizeof(JPXTile)) { >+ error(getPos(), "Bad tile count in JPX SIZ marker segment"); >+ return gFalse; >+ } >+ img.tiles = (JPXTile *)gmalloc(nTiles * sizeof(JPXTile)); > for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { > img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * > sizeof(JPXTileComp)); >diff -Nur poppler-0.4.2/poppler/Stream.cc poppler-0.4.2.new/poppler/Stream.cc >--- poppler-0.4.2/poppler/Stream.cc 2005-04-27 22:56:18.000000000 +0200 >+++ poppler-0.4.2.new/poppler/Stream.cc 2005-12-09 17:40:53.000000000 +0100 >@@ -15,6 +15,7 @@ > #include <stdio.h> > #include <stdlib.h> > #include <stddef.h> >+#include <limits.h> > #ifndef WIN32 > #include <unistd.h> > #endif >@@ -420,13 +421,28 @@ > width = widthA; > nComps = nCompsA; > nBits = nBitsA; >+ predLine = NULL; >+ ok = gFalse; > >+ if (width <= 0 || nComps <= 0 || nBits <= 0 || >+ nComps >= INT_MAX/nBits || >+ width >= INT_MAX/nComps/nBits) { >+ return; >+ } > nVals = width * nComps; >+ if (nVals * nBits + 7 <= 0) { >+ return; >+ } > pixBytes = (nComps * nBits + 7) >> 3; > rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; >+ if (rowBytes < 0) { >+ return; >+ } > predLine = (Guchar *)gmalloc(rowBytes); > memset(predLine, 0, rowBytes); > predIdx = rowBytes; >+ >+ ok = gTrue; > } > > StreamPredictor::~StreamPredictor() { >@@ -1020,6 +1036,10 @@ > FilterStream(strA) { > if (predictor != 1) { > pred = new StreamPredictor(this, predictor, columns, colors, bits); >+ if (!pred->isOk()) { >+ delete pred; >+ pred = NULL; >+ } > } else { > pred = NULL; > } >@@ -2907,6 +2927,10 @@ > height = read16(); > width = read16(); > numComps = str->getChar(); >+ if (numComps <= 0 || numComps > 4) { >+ error(getPos(), "Bad number of components in DCT stream", prec); >+ return gFalse; >+ } > if (prec != 8) { > error(getPos(), "Bad DCT precision %d", prec); > return gFalse; >@@ -2933,6 +2957,10 @@ > height = read16(); > width = read16(); > numComps = str->getChar(); >+ if (numComps <= 0 || numComps > 4) { >+ error(getPos(), "Bad number of components in DCT stream", prec); >+ return gFalse; >+ } > if (prec != 8) { > error(getPos(), "Bad DCT precision %d", prec); > return gFalse; >@@ -2955,6 +2983,10 @@ > > length = read16() - 2; > scanInfo.numComps = str->getChar(); >+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { >+ error(getPos(), "Bad number of components in DCT stream"); >+ return gFalse; >+ } > --length; > if (length != 2 * scanInfo.numComps + 3) { > error(getPos(), "Bad DCT scan info block"); >@@ -3268,6 +3300,10 @@ > FilterStream(strA) { > if (predictor != 1) { > pred = new StreamPredictor(this, predictor, columns, colors, bits); >+ if (!pred->isOk()) { >+ delete pred; >+ pred = NULL; >+ } > } else { > pred = NULL; > } >diff -Nur poppler-0.4.2/poppler/Stream.h poppler-0.4.2.new/poppler/Stream.h >--- poppler-0.4.2/poppler/Stream.h 2005-04-27 22:56:18.000000000 +0200 >+++ poppler-0.4.2.new/poppler/Stream.h 2005-12-09 17:40:53.000000000 +0100 >@@ -231,6 +231,8 @@ > > ~StreamPredictor(); > >+ GBool isOk() { return ok; } >+ > int lookChar(); > int getChar(); > >@@ -248,6 +250,7 @@ > int rowBytes; // bytes per line > Guchar *predLine; // line buffer > int predIdx; // current index in predLine >+ GBool ok; > }; > > //------------------------------------------------------------------------
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 8632
:
1292
| 1293