summaryrefslogtreecommitdiff
path: root/third_party/libtiff/tif_ojpeg.c
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-02-23 15:55:32 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-24 21:15:10 +0000
commit0b6447a7231b5263d10f2bd9be3088f93af9629f (patch)
treecbcf225a00bbfed9dddd499373f7517c183e5425 /third_party/libtiff/tif_ojpeg.c
parent37e2bd1acf843db4eef891d994390520b8fcf3fa (diff)
downloadpdfium-0b6447a7231b5263d10f2bd9be3088f93af9629f.tar.xz
Libtiff: fix leaking tables in tif_ojpeg.c
Tables should be freed before they are reassigned. This CL fixes the three places where this is not happening. BUG=694599 Change-Id: I4e7cf1a6354b1129ecaf7ddcc74d8a36ba289df7 Reviewed-on: https://pdfium-review.googlesource.com/2830 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tif_ojpeg.c')
-rw-r--r--third_party/libtiff/tif_ojpeg.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c
index f69b00148c..1a700d5bc2 100644
--- a/third_party/libtiff/tif_ojpeg.c
+++ b/third_party/libtiff/tif_ojpeg.c
@@ -1794,6 +1794,8 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
_TIFFfree(ob);
return(0);
}
+ if(sp->qtable[m]!=0)
+ _TIFFfree(sp->qtable[m]);
sp->qtable[m]=ob;
sp->sof_tq[m]=m;
}
@@ -1861,6 +1863,8 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
_TIFFfree(rb);
return(0);
}
+ if(sp->dctable[m]!=0)
+ _TIFFfree(sp->dctable[m]);
sp->dctable[m]=rb;
sp->sos_tda[m]=(m<<4);
}
@@ -1928,6 +1932,8 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif)
_TIFFfree(rb);
return(0);
}
+ if(sp->actable[m])
+ _TIFFfree(sp->actable[m]);
sp->actable[m]=rb;
sp->sos_tda[m]=(sp->sos_tda[m]|m);
}