From 766901f5ec79b3c3ccd1e872f699642d771a89c5 Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 4 Aug 2016 10:34:38 -0700 Subject: Add bounds checks to CWeightTable::Calc() and friends. BUG=624514 Review-Url: https://codereview.chromium.org/2204773003 --- core/fxge/dib/dib_int.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'core/fxge/dib/dib_int.h') diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h index 61533baf2c..aa4a7927fb 100644 --- a/core/fxge/dib/dib_int.h +++ b/core/fxge/dib/dib_int.h @@ -40,25 +40,27 @@ struct PixelWeight { int m_SrcEnd; int m_Weights[1]; }; + class CWeightTable { public: - CWeightTable() { m_pWeightTables = nullptr; } - ~CWeightTable() { - FX_Free(m_pWeightTables); - m_pWeightTables = nullptr; - } - void Calc(int dest_len, + CWeightTable(); + ~CWeightTable(); + + bool Calc(int dest_len, int dest_min, int dest_max, int src_len, int src_min, int src_max, int flags); - PixelWeight* GetPixelWeight(int pixel) { - return (PixelWeight*)(m_pWeightTables + (pixel - m_DestMin) * m_ItemSize); - } - int m_DestMin, m_ItemSize; + PixelWeight* GetPixelWeight(int pixel) const; + int* GetValueFromPixelWeight(PixelWeight* pWeight, int index) const; + + private: + int m_DestMin; + int m_ItemSize; uint8_t* m_pWeightTables; + size_t m_dwWeightTablesSize; }; class CStretchEngine { -- cgit v1.2.3