summaryrefslogtreecommitdiff
path: root/third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-01-12 13:26:18 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-01-12 19:10:40 +0000
commit73debd4d226114b88430f2cc30dac056be5c13f3 (patch)
tree2daf94136efd39b9fc241a9c3975b76c558e6f2b /third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff
parentdb7647083d0a5cd2221b94faa15c149214d21725 (diff)
downloadpdfium-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>
Diffstat (limited to 'third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff')
-rw-r--r--third_party/libtiff/0015-fix-leaks-in-tif_ojpeg.diff37
1 files changed, 37 insertions, 0 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);
+ }