diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-01-26 15:45:02 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-26 22:24:08 +0000 |
| commit | 0630447196b898b60103ca634e5c9d034b9d24d1 (patch) | |
| tree | 61bd5749483cca95d1c33a8b336a0ec9a58201ca /third_party/libtiff/tif_predict.c | |
| parent | 0370d6b8aab1b7880dd2727e7d9aed04cc358360 (diff) | |
| download | pdfium-0630447196b898b60103ca634e5c9d034b9d24d1.tar.xz | |
Fix leak in PredictorSetupDecode by calling tif_cleanup on failure
tif_data and tif_cleanup are both set on the TIFFInit methods, see for
instance TIFFInitPixarLog. If PredictorSetupDecode fails, whatever was
filled on tif_data should be cleaned up. The previous leak fix from
PixarLogSetupDecode is no longer necessary.
BUG=683834
Change-Id: Ib7dec3fb8addd56fa20f2e85c4ee918222a5f97e
Reviewed-on: https://pdfium-review.googlesource.com/2432
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libtiff/tif_predict.c')
| -rw-r--r-- | third_party/libtiff/tif_predict.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libtiff/tif_predict.c b/third_party/libtiff/tif_predict.c index 1388dde59c..8975672aec 100644 --- a/third_party/libtiff/tif_predict.c +++ b/third_party/libtiff/tif_predict.c @@ -109,7 +109,10 @@ PredictorSetupDecode(TIFF* tif) TIFFDirectory* td = &tif->tif_dir; if (!(*sp->setupdecode)(tif) || !PredictorSetup(tif)) + { + (*tif->tif_cleanup)(tif); return 0; + } if (sp->predictor == 2) { switch (td->td_bitspersample) { |