From ac8357b3ec7e1fe4000ebcae5ce65a38bfeb5cb1 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Mon, 28 May 2018 20:06:19 +0000 Subject: Revert 'Remove almost all usages of CFX_FixedBufGrow with std::vector' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a manual revert of the CL at: https://pdfium-review.googlesource.com/c/pdfium/+/32159 The only file manually changed was cpdf_renderstatus.cpp Reason for revert: the bug below shows that sometimes the vector size used is larger than the parameter given to CFX_FixedBufGrow. Thus, we will revert, then add vectors using std::max unless it's clear from the code that the code will never access indices outside. Bug: chromium:847247 Change-Id: Iee54af023c8564824418a7d34a6385b0bc418ff0 Reviewed-on: https://pdfium-review.googlesource.com/33050 Reviewed-by: dsinclair Commit-Queue: Nicolás Peña Moreno --- core/fpdfapi/page/cpdf_colorspace.cpp | 47 ++++++++++++++++++++----------- core/fpdfapi/render/cpdf_dibsource.cpp | 12 ++++---- core/fpdfapi/render/cpdf_renderstatus.cpp | 36 +++++++++++++---------- core/fxcodec/codec/fx_codec_icc.cpp | 19 +++++++------ core/fxge/apple/fx_apple_platform.cpp | 17 ++++++----- 5 files changed, 77 insertions(+), 54 deletions(-) (limited to 'core') diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp index 354a342d90..31c485fe03 100644 --- a/core/fpdfapi/page/cpdf_colorspace.cpp +++ b/core/fpdfapi/page/cpdf_colorspace.cpp @@ -31,6 +31,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fxcodec/codec/ccodec_iccmodule.h" #include "core/fxcodec/fx_codec.h" +#include "core/fxcrt/cfx_fixedbufgrow.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/maybe_owned.h" #include "third_party/base/stl_util.h" @@ -573,7 +574,8 @@ void CPDF_ColorSpace::TranslateImageLine(uint8_t* dest_buf, int image_width, int image_height, bool bTransMask) const { - std::vector src(m_nComponents); + CFX_FixedBufGrow srcbuf(m_nComponents); + float* src = srcbuf; float R; float G; float B; @@ -581,7 +583,7 @@ void CPDF_ColorSpace::TranslateImageLine(uint8_t* dest_buf, for (int i = 0; i < pixels; i++) { for (uint32_t j = 0; j < m_nComponents; j++) src[j] = static_cast(*src_buf++) / divisor; - GetRGB(src.data(), &R, &G, &B); + GetRGB(src, &R, &G, &B); *dest_buf++ = static_cast(B * 255); *dest_buf++ = static_cast(G * 255); *dest_buf++ = static_cast(R * 255); @@ -1151,15 +1153,15 @@ bool CPDF_IndexedCS::GetRGB(const float* pBuf, return false; } } - std::vector comps; - comps.reserve(m_nBaseComponents); + CFX_FixedBufGrow Comps(m_nBaseComponents); + float* comps = Comps; const uint8_t* pTable = m_Table.raw_str(); for (uint32_t i = 0; i < m_nBaseComponents; i++) { - comps.push_back(m_pCompMinMax[i * 2] + - m_pCompMinMax[i * 2 + 1] * - pTable[index * m_nBaseComponents + i] / 255); + comps[i] = + m_pCompMinMax[i * 2] + + m_pCompMinMax[i * 2 + 1] * pTable[index * m_nBaseComponents + i] / 255; } - return m_pBaseCS->GetRGB(comps.data(), R, G, B); + return m_pBaseCS->GetRGB(comps, R, G, B); } void CPDF_IndexedCS::EnableStdConversion(bool bEnabled) { @@ -1216,21 +1218,32 @@ bool CPDF_SeparationCS::GetRGB(const float* pBuf, float* R, float* G, float* B) const { - if (m_Type == None || !m_pAltCS) + if (m_Type == None) return false; if (!m_pFunc) { + if (!m_pAltCS) + return false; + int nComps = m_pAltCS->CountComponents(); - std::vector results(nComps, *pBuf); - return m_pAltCS->GetRGB(results.data(), R, G, B); + CFX_FixedBufGrow results(nComps); + for (int i = 0; i < nComps; i++) + results[i] = *pBuf; + return m_pAltCS->GetRGB(results, R, G, B); } - std::vector results2(m_pFunc->CountOutputs()); + CFX_FixedBufGrow results(m_pFunc->CountOutputs()); int nresults = 0; - if (!m_pFunc->Call(pBuf, 1, results2.data(), &nresults) || nresults == 0) + if (!m_pFunc->Call(pBuf, 1, results, &nresults) || nresults == 0) return false; - return m_pAltCS->GetRGB(results2.data(), R, G, B); + if (m_pAltCS) + return m_pAltCS->GetRGB(results, R, G, B); + + R = 0; + G = 0; + B = 0; + return false; } void CPDF_SeparationCS::EnableStdConversion(bool bEnabled) { @@ -1285,14 +1298,14 @@ bool CPDF_DeviceNCS::GetRGB(const float* pBuf, if (!m_pFunc) return false; - std::vector results(m_pFunc->CountOutputs()); + CFX_FixedBufGrow results(m_pFunc->CountOutputs()); int nresults = 0; - if (!m_pFunc->Call(pBuf, CountComponents(), results.data(), &nresults) || + if (!m_pFunc->Call(pBuf, CountComponents(), results, &nresults) || nresults == 0) { return false; } - return m_pAltCS->GetRGB(results.data(), R, G, B); + return m_pAltCS->GetRGB(results, R, G, B); } void CPDF_DeviceNCS::EnableStdConversion(bool bEnabled) { diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index ad828f2372..4241fb1b40 100644 --- a/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp @@ -761,7 +761,8 @@ void CPDF_DIBSource::LoadPalette() { } int palette_count = 1 << (m_bpc * m_nComponents); - std::vector color_value(m_nComponents); + CFX_FixedBufGrow color_values(m_nComponents); + float* color_value = color_values; for (int i = 0; i < palette_count; i++) { int color_data = i; for (uint32_t j = 0; j < m_nComponents; j++) { @@ -778,11 +779,11 @@ void CPDF_DIBSource::LoadPalette() { int nComponents = m_pColorSpace->CountComponents(); std::vector temp_buf(nComponents); for (int k = 0; k < nComponents; k++) { - temp_buf[k] = color_value[0]; + temp_buf[k] = *color_value; } m_pColorSpace->GetRGB(temp_buf.data(), &R, &G, &B); } else { - m_pColorSpace->GetRGB(color_value.data(), &R, &G, &B); + m_pColorSpace->GetRGB(color_value, &R, &G, &B); } SetPaletteArgb(i, ArgbEncode(255, FXSYS_round(R * 255), FXSYS_round(G * 255), FXSYS_round(B * 255))); @@ -830,7 +831,8 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, if (TranslateScanline24bppDefaultDecode(dest_scan, src_scan)) return; - std::vector color_values(m_nComponents); + CFX_FixedBufGrow color_values1(m_nComponents); + float* color_values = color_values1; float R = 0.0f; float G = 0.0f; float B = 0.0f; @@ -858,7 +860,7 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, G = (1.0f - color_values[1]) * k; B = (1.0f - color_values[2]) * k; } else if (m_Family != PDFCS_PATTERN) { - m_pColorSpace->GetRGB(color_values.data(), &R, &G, &B); + m_pColorSpace->GetRGB(color_values, &R, &G, &B); } R = pdfium::clamp(R, 0.0f, 1.0f); G = pdfium::clamp(G, 0.0f, 1.0f); diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 8c3c8796e4..f99000bb69 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -49,6 +49,7 @@ #include "core/fpdfapi/render/cpdf_type3cache.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/autorestorer.h" +#include "core/fxcrt/cfx_fixedbufgrow.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/maybe_owned.h" #include "core/fxge/cfx_defaultrenderdevice.h" @@ -151,7 +152,9 @@ void DrawAxialShading(const RetainPtr& pBitmap, float y_span = end_y - start_y; float axis_len_square = (x_span * x_span) + (y_span * y_span); - std::vector results(total_results); + CFX_FixedBufGrow result_array(total_results); + float* pResults = result_array; + memset(pResults, 0, total_results * sizeof(float)); uint32_t rgb_array[kShadingSteps]; for (int i = 0; i < kShadingSteps; i++) { float input = (t_max - t_min) * i / kShadingSteps + t_min; @@ -159,14 +162,14 @@ void DrawAxialShading(const RetainPtr& pBitmap, for (const auto& func : funcs) { if (func) { int nresults = 0; - if (func->Call(&input, 1, results.data() + offset, &nresults)) + if (func->Call(&input, 1, pResults + offset, &nresults)) offset += nresults; } } float R = 0.0f; float G = 0.0f; float B = 0.0f; - pCS->GetRGB(results.data(), &R, &G, &B); + pCS->GetRGB(pResults, &R, &G, &B); rgb_array[i] = FXARGB_TODIB(FXARGB_MAKE(alpha, FXSYS_round(R * 255), FXSYS_round(G * 255), FXSYS_round(B * 255))); @@ -235,7 +238,9 @@ void DrawRadialShading(const RetainPtr& pBitmap, bEndExtend = !!pArray->GetIntegerAt(1); } - std::vector results(total_results); + CFX_FixedBufGrow result_array(total_results); + float* pResults = result_array; + memset(pResults, 0, total_results * sizeof(float)); uint32_t rgb_array[kShadingSteps]; for (int i = 0; i < kShadingSteps; i++) { float input = (t_max - t_min) * i / kShadingSteps + t_min; @@ -243,14 +248,14 @@ void DrawRadialShading(const RetainPtr& pBitmap, for (const auto& func : funcs) { if (func) { int nresults; - if (func->Call(&input, 1, results.data() + offset, &nresults)) + if (func->Call(&input, 1, pResults + offset, &nresults)) offset += nresults; } } float R = 0.0f; float G = 0.0f; float B = 0.0f; - pCS->GetRGB(results.data(), &R, &G, &B); + pCS->GetRGB(pResults, &R, &G, &B); rgb_array[i] = FXARGB_TODIB(FXARGB_MAKE(alpha, FXSYS_round(R * 255), FXSYS_round(G * 255), FXSYS_round(B * 255))); @@ -362,7 +367,9 @@ void DrawFuncShading(const RetainPtr& pBitmap, int height = pBitmap->GetHeight(); int pitch = pBitmap->GetPitch(); - std::vector results(total_results); + CFX_FixedBufGrow result_array(total_results); + float* pResults = result_array; + memset(pResults, 0, total_results * sizeof(float)); for (int row = 0; row < height; row++) { uint32_t* dib_buf = (uint32_t*)(pBitmap->GetBuffer() + row * pitch); for (int column = 0; column < width; column++) { @@ -376,7 +383,7 @@ void DrawFuncShading(const RetainPtr& pBitmap, for (const auto& func : funcs) { if (func) { int nresults; - if (func->Call(input, 2, results.data() + offset, &nresults)) + if (func->Call(input, 2, pResults + offset, &nresults)) offset += nresults; } } @@ -384,7 +391,7 @@ void DrawFuncShading(const RetainPtr& pBitmap, float R = 0.0f; float G = 0.0f; float B = 0.0f; - pCS->GetRGB(results.data(), &R, &G, &B); + pCS->GetRGB(pResults, &R, &G, &B); dib_buf[column] = FXARGB_TODIB(FXARGB_MAKE( alpha, (int32_t)(R * 255), (int32_t)(G * 255), (int32_t)(B * 255))); } @@ -2049,14 +2056,13 @@ void CPDF_RenderStatus::DrawShading(const CPDF_ShadingPattern* pPattern, const CPDF_Array* pBackColor = pDict->GetArrayFor("Background"); if (pBackColor && pBackColor->GetCount() >= pColorSpace->CountComponents()) { - std::vector comps; - comps.reserve(pColorSpace->CountComponents()); + CFX_FixedBufGrow comps(pColorSpace->CountComponents()); for (uint32_t i = 0; i < pColorSpace->CountComponents(); i++) - comps.push_back(pBackColor->GetNumberAt(i)); + comps[i] = pBackColor->GetNumberAt(i); float R = 0.0f; float G = 0.0f; float B = 0.0f; - pColorSpace->GetRGB(comps.data(), &R, &G, &B); + pColorSpace->GetRGB(comps, &R, &G, &B); background = ArgbEncode(255, (int32_t)(R * 255), (int32_t)(G * 255), (int32_t)(B * 255)); } @@ -2596,11 +2602,11 @@ RetainPtr CPDF_RenderStatus::LoadSMask( int src_pitch = bitmap.GetPitch(); std::vector transfers(256); if (pFunc) { - std::vector results(pFunc->CountOutputs()); + CFX_FixedBufGrow results(pFunc->CountOutputs()); for (int i = 0; i < 256; i++) { float input = (float)i / 255.0f; int nresult; - pFunc->Call(&input, 1, results.data(), &nresult); + pFunc->Call(&input, 1, results, &nresult); transfers[i] = FXSYS_round(results[0] * 255); } } else { diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp index 458816e77e..29b37d19ac 100644 --- a/core/fxcodec/codec/fx_codec_icc.cpp +++ b/core/fxcodec/codec/fx_codec_icc.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include -#include #include "core/fxcodec/codec/ccodec_iccmodule.h" #include "core/fxcodec/codec/codec_int.h" +#include "core/fxcrt/cfx_fixedbufgrow.h" namespace { @@ -124,16 +124,19 @@ void CCodec_IccModule::Translate(CLcmsCmm* pTransform, uint32_t nSrcComponents = m_nComponents; uint8_t output[4]; if (pTransform->m_bLab) { - std::vector input(pSrcValues, pSrcValues + nSrcComponents); - cmsDoTransform(pTransform->m_hTransform, input.data(), output, 1); + CFX_FixedBufGrow inputs(nSrcComponents); + double* input = inputs; + for (uint32_t i = 0; i < nSrcComponents; ++i) + input[i] = pSrcValues[i]; + cmsDoTransform(pTransform->m_hTransform, input, output, 1); } else { - std::vector input; - input.reserve(nSrcComponents); + CFX_FixedBufGrow inputs(nSrcComponents); + uint8_t* input = inputs; for (uint32_t i = 0; i < nSrcComponents; ++i) { - input.push_back( - pdfium::clamp(static_cast(pSrcValues[i] * 255.0f), 0, 255)); + input[i] = + pdfium::clamp(static_cast(pSrcValues[i] * 255.0f), 0, 255); } - cmsDoTransform(pTransform->m_hTransform, input.data(), output, 1); + cmsDoTransform(pTransform->m_hTransform, input, output, 1); } pDestValues[0] = output[2] / 255.0f; pDestValues[1] = output[1] / 255.0f; diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 013be8f414..1801814e66 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include -#include +#include "core/fxcrt/cfx_fixedbufgrow.h" #include "core/fxcrt/fx_system.h" #ifndef _SKIA_SUPPORT_ @@ -57,12 +57,11 @@ bool CGDrawGlyphRun(CGContextRef pContext, if (!pFont->GetPlatformFont()) return false; } - std::vector glyph_indices; - glyph_indices.reserve(nChars); - std::vector glyph_positions(nChars); + CFX_FixedBufGrow glyph_indices(nChars); + CFX_FixedBufGrow glyph_positions(nChars); for (int i = 0; i < nChars; i++) { - glyph_indices.push_back(pCharPos[i].m_ExtGID ? pCharPos[i].m_ExtGID - : pCharPos[i].m_GlyphIndex); + glyph_indices[i] = + pCharPos[i].m_ExtGID ? pCharPos[i].m_ExtGID : pCharPos[i].m_GlyphIndex; if (bNegSize) glyph_positions[i].x = -pCharPos[i].m_Origin.x; else @@ -77,9 +76,9 @@ bool CGDrawGlyphRun(CGContextRef pContext, new_matrix.d = -new_matrix.d; } quartz2d.setGraphicsTextMatrix(pContext, &new_matrix); - return quartz2d.drawGraphicsString( - pContext, pFont->GetPlatformFont(), font_size, glyph_indices.data(), - glyph_positions.data(), nChars, argb, nullptr); + return quartz2d.drawGraphicsString(pContext, pFont->GetPlatformFont(), + font_size, glyph_indices, glyph_positions, + nChars, argb, nullptr); } } // namespace -- cgit v1.2.3