XFA: avoid multiplications in FX_Allocs

In some cases, we can use the safe FX_Alloc2D, in others
there's an extra multiplication by the size of the type.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1519233002 .

1 files changed, 2 insertions, 2 deletions

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index af63d19bfe..ba822ce1d2 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -360,7 +360,7 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
   if (mode == BYTE_COMPACTION_MODE_LATCH) {

     int32_t count = 0;

     int64_t value = 0;

-    FX_WORD* decodedData = FX_Alloc(FX_WORD, 6 * sizeof(FX_WORD));

+    FX_WORD* decodedData = FX_Alloc(FX_WORD, 6);

     CFX_Int32Array byteCompactedCodewords;

     byteCompactedCodewords.SetSize(6);

     FX_BOOL end = FALSE;

@@ -421,7 +421,7 @@ int32_t CBC_DecodedBitStreamPaser::byteCompaction(int32_t mode,
         }

       }

       if ((count % 5 == 0) && (count > 0)) {

-        FX_WORD* decodedData = FX_Alloc(FX_WORD, 6 * sizeof(FX_WORD));

+        FX_WORD* decodedData = FX_Alloc(FX_WORD, 6);

         int32_t j = 0;

         for (; j < 6; ++j) {

           decodedData[5 - j] = (FX_WORD)(value & 0xFF);