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/include/fxcrt/fx_basic.h | |
| 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/include/fxcrt/fx_basic.h')
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index de80ea7f7a..7c25b237ad 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -1463,10 +1463,7 @@ public: while (nCount > 0) { FX_INT32 temp_count = FX_MIN(nCount, FX_DATALIST_LENGTH); DataList list; - list.data = FX_Alloc(FX_BYTE, temp_count * unit); - if (!list.data) { - break; - } + list.data = FX_Alloc2D(FX_BYTE, temp_count, unit); list.start = nStart; list.count = temp_count; Append(list); |