diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-29 09:51:03 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-29 09:51:03 -0700 |
commit | 83488a802d3e6f02faad6accbc17aa5da5795e63 (patch) | |
tree | aeb72bfc3c2bef29eb432a2ff353ace231d42b55 /core/src/fxcodec/codec/codec_int.h | |
parent | 58a9ba4f2c0cb4122e6a278079f7c2ba7363ad51 (diff) | |
download | pdfium-83488a802d3e6f02faad6accbc17aa5da5795e63.tar.xz |
XFA: remove unsafe exif parsing code
Fortunately, this could only be called with a null buffer,
so none of unchecked lengths could be used. The remaining
use of the CFX_/IFX_DIBAttributeEx class is as a table, so
put one directly in the CFX_DIBAttribute.
Fix a "register" warning along the way.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1425983002 .
Diffstat (limited to 'core/src/fxcodec/codec/codec_int.h')
-rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 510d0abe78..36716411b7 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -385,38 +385,6 @@ class CCodec_Jbig2Module : public ICodec_Jbig2Module { IFX_Pause* pPause) override; void DestroyJbig2Context(void* pJbig2Context) override; }; -class CFX_DIBAttributeExif : public IFX_DIBAttributeExif { - public: - CFX_DIBAttributeExif(); - ~CFX_DIBAttributeExif(); - virtual FX_BOOL GetInfo(FX_WORD tag, void* val); - - FX_BOOL ParseExif(CFX_MapPtrTemplate<FX_DWORD, uint8_t*>* pHead, - uint8_t* data, - FX_DWORD len, - CFX_MapPtrTemplate<FX_DWORD, uint8_t*>* pVal); - - typedef FX_WORD (*_Read2Bytes)(uint8_t* data); - typedef FX_DWORD (*_Read4Bytes)(uint8_t* data); - uint8_t* ParseExifIFH(uint8_t* data, - FX_DWORD len, - _Read2Bytes* pReadWord, - _Read4Bytes* pReadDword); - FX_BOOL ParseExifIFD(CFX_MapPtrTemplate<FX_DWORD, uint8_t*>* pMap, - uint8_t* data, - FX_DWORD len); - - uint8_t* m_pExifData; - - FX_DWORD m_dwExifDataLen; - - void clear(); - _Read2Bytes m_readWord; - _Read4Bytes m_readDword; - CFX_MapPtrTemplate<FX_DWORD, uint8_t*> m_TagHead; - CFX_MapPtrTemplate<FX_DWORD, uint8_t*> m_TagVal; -}; - struct DecodeData { public: DecodeData(unsigned char* src_data, OPJ_SIZE_T src_size) |