diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:29:22 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-05-18 14:29:22 -0700 |
| commit | 038cd084817aca8017255a6b3782fcba2688d2cb (patch) | |
| tree | 2f6a4e2c6969139dedc64961102b0dc8d0b8661d /core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | |
| parent | ed099befbb300d6f9c393cb415fdb2a68c2ef471 (diff) | |
| download | pdfium-038cd084817aca8017255a6b3782fcba2688d2cb.tar.xz | |
Merge to XFA: Add safe FX_Alloc2D() macro
Original Review URL: https://codereview.chromium.org/1143663004
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1136673005
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp index ac3f2b29d7..6fa7419a41 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp @@ -296,7 +296,7 @@ void CPDF_DecryptFilter::v_FilterFinish(CFX_BinaryBuf& dest_buf) extern "C" { static void* my_alloc_func (void* opaque, unsigned int items, unsigned int size) { - return FX_Alloc(FX_BYTE, items * size); + return FX_Alloc2D(FX_BYTE, items, size); } static void my_free_func (void* opaque, void* address) { |