Move maxNumDataBytes and maxNumEcBytes calculation to fix crash
The blocks.Add will std::move the unique_ptrs, so the std::max calculations
need to go before. Without this change, pdfium_test will crash when trying
to render test/barcode_test.pdf with XFA enabled.
Tested that after this change, barcode_test.pdf is rendered without crashing.
Review-Url: https://codereview.chromium.org/2298833002
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 7f332b6..209a965 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -885,10 +885,10 @@
std::unique_ptr<CBC_CommonByteArray> ecBytes(
GenerateECBytes(dataBytes.get(), numEcBytesInBlosk, e));
BC_EXCEPTION_CHECK_ReturnVoid(e);
- blocks.Add(
- new CBC_QRCoderBlockPair(std::move(dataBytes), std::move(ecBytes)));
maxNumDataBytes = std::max(maxNumDataBytes, dataBytes->Size());
maxNumEcBytes = std::max(maxNumEcBytes, ecBytes->Size());
+ blocks.Add(
+ new CBC_QRCoderBlockPair(std::move(dataBytes), std::move(ecBytes)));
dataBytesOffset += numDataBytesInBlock;
}
if (numDataBytes != dataBytesOffset) {
