diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-01-12 13:26:18 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-12 19:10:40 +0000 |
| commit | 73debd4d226114b88430f2cc30dac056be5c13f3 (patch) | |
| tree | 2daf94136efd39b9fc241a9c3975b76c558e6f2b | |
| parent | db7647083d0a5cd2221b94faa15c149214d21725 (diff) | |
| download | pdfium-73debd4d226114b88430f2cc30dac056be5c13f3.tar.xz | |
Fix leak in OJPEGReadHeaderInfoSecTablesAcTable when read fails.
If rb is allocated memory but p != q, then it will not be assigned to
sp->actable[m], so it will leak.
BUG=680520
Change-Id: Ib0b178b043b2a9821fb289d033ca0ab52e4cbe48
Reviewed-on: https://pdfium-review.googlesource.com/2176
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
| -rw-r--r-- | third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff | 37 | ||||
| -rw-r--r-- | third_party/libtiff/README.pdfium | 3 | ||||
| -rw-r--r-- | third_party/libtiff/tif_ojpeg.c | 9 |
3 files changed, 48 insertions, 1 deletions
diff --git a/third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff b/third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff new file mode 100644 index 0000000000..e9d3a408bf --- /dev/null +++ b/third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff @@ -0,0 +1,37 @@ +diff --git a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c +index cc5449cd6..f69b00148 100644 +--- a/third_party/libtiff/tif_ojpeg.c ++++ b/third_party/libtiff/tif_ojpeg.c +@@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) + TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); + p=TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); + if (p!=64) ++ { ++ _TIFFfree(ob); + return(0); ++ } + sp->qtable[m]=ob; + sp->sof_tq[m]=m; + } +@@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) + rb[sizeof(uint32)+5+n]=o[n]; + p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); + if (p!=q) ++ { ++ _TIFFfree(rb); + return(0); ++ } + sp->dctable[m]=rb; + sp->sos_tda[m]=(m<<4); + } +@@ -1918,7 +1924,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) + rb[sizeof(uint32)+5+n]=o[n]; + p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); + if (p!=q) ++ { ++ _TIFFfree(rb); + return(0); ++ } + sp->actable[m]=rb; + sp->sos_tda[m]=(sp->sos_tda[m]|m); + } diff --git a/third_party/libtiff/README.pdfium b/third_party/libtiff/README.pdfium index 58bb63e40e..cc50be73e6 100644 --- a/third_party/libtiff/README.pdfium +++ b/third_party/libtiff/README.pdfium @@ -23,4 +23,5 @@ Local Modifications: 0011-fix-leak-imagebegin2: Apply upstream fix related to our previous patch 0012-initialize-tif-rawdata.patch: Initialize tif_rawdata to guard against unitialized access 0013-validate-refblackwhite.patch: Make sure the refblackwhite values aren't nan. -0014-cast-to-unsigned-in-putagreytile.patch: casting to avoid undefined shifts.
\ No newline at end of file +0014-cast-to-unsigned-in-putagreytile.patch: casting to avoid undefined shifts. +0015-fix-leaks-in-tif_ojpeg.diff: fix direct leaks in tif_ojpeg.c methods diff --git a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c index cc5449cd65..f69b00148c 100644 --- a/third_party/libtiff/tif_ojpeg.c +++ b/third_party/libtiff/tif_ojpeg.c @@ -1790,7 +1790,10 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif) TIFFSeekFile(tif,sp->qtable_offset[m],SEEK_SET); p=TIFFReadFile(tif,&ob[sizeof(uint32)+5],64); if (p!=64) + { + _TIFFfree(ob); return(0); + } sp->qtable[m]=ob; sp->sof_tq[m]=m; } @@ -1854,7 +1857,10 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif) rb[sizeof(uint32)+5+n]=o[n]; p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); if (p!=q) + { + _TIFFfree(rb); return(0); + } sp->dctable[m]=rb; sp->sos_tda[m]=(m<<4); } @@ -1918,7 +1924,10 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif) rb[sizeof(uint32)+5+n]=o[n]; p=TIFFReadFile(tif,&(rb[sizeof(uint32)+21]),q); if (p!=q) + { + _TIFFfree(rb); return(0); + } sp->actable[m]=rb; sp->sos_tda[m]=(sp->sos_tda[m]|m); } |