Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Issue 2227743004: Merge 3 CLs to M53. (Closed)

Created:
4 years, 4 months ago by Oliver Chang
Modified:
4 years, 4 months ago
Reviewers:
Lei Zhang
CC:
pdfium-reviews_googlegroups.com
Base URL:
https://pdfium.googlesource.com/pdfium.git@2785
Target Ref:
refs/heads/chromium/2785
Project:
pdfium
Visibility:
Public.

Description

Merge 3 CLs to M53. R=thestig@chromium.org Add bounds checks to CWeightTable::Calc() and friends. BUG=624514 Review-Url: https://codereview.chromium.org/2204773003 (cherry picked from commit 766901f5ec79b3c3ccd1e872f699642d771a89c5) openjpeg: Prevent overflows when using opj_aligned_malloc() BUG=628304 Review-Url: https://codereview.chromium.org/2218783002 (cherry picked from commit b20ab6c7acb3be1393461eb650ca8fa4660c937e) openjpeg: Prevent integer overflows during calculation of |l_nb_code_blocks_size| BUG=628890 Review-Url: https://codereview.chromium.org/2212973002 (cherry picked from commit ff74356915d4c7f7c6eb16de1e9f403da4ecb6d5) Committed: https://pdfium.googlesource.com/pdfium/+/07afc9aad0444ec9c31f338e9409038734b600c0

Patch Set 1 : conflict in fx_dib_engine.cpp #

Patch Set 2 : resolve conflict #

Unified diffs Side-by-side diffs Delta from patch set Stats (+261 lines, -67 lines) Patch
M AUTHORS View 1 chunk +1 line, -0 lines 0 comments Download
M core/fxge/dib/dib_int.h View 1 chunk +12 lines, -10 lines 0 comments Download
M core/fxge/dib/fx_dib_engine.cpp View 1 19 chunks +122 lines, -56 lines 0 comments Download
A third_party/libopenjpeg20/0019-tcd_init_tile.patch View 1 chunk +30 lines, -0 lines 0 comments Download
A third_party/libopenjpeg20/0020-opj_aligned_malloc.patch View 1 chunk +67 lines, -0 lines 0 comments Download
M third_party/libopenjpeg20/README.pdfium View 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/libopenjpeg20/dwt.c View 2 chunks +14 lines, -1 line 0 comments Download
M third_party/libopenjpeg20/t1.c View 2 chunks +6 lines, -0 lines 0 comments Download
M third_party/libopenjpeg20/tcd.c View 1 chunk +7 lines, -0 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
Oliver Chang
ptal. there's a minor conflict in fx_dib_engine.cpp
4 years, 4 months ago (2016-08-09 03:43:07 UTC) #1
Lei Zhang
lgtm
4 years, 4 months ago (2016-08-09 05:05:25 UTC) #2
Oliver Chang
4 years, 4 months ago (2016-08-09 15:58:02 UTC) #4
Message was sent while issue was closed.
Committed patchset #2 (id:20001) manually as
07afc9aad0444ec9c31f338e9409038734b600c0 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698