diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-09-13 17:41:52 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-13 17:41:52 +0000 |
commit | a5d7ad3aa8feb08a14b5cca173d673054c1ade23 (patch) | |
tree | 259f0c17f5b7a2e09f80948f8b5cc8a04fdb7874 /core/fpdfapi/page/cpdf_streamcontentparser.h | |
parent | aebace3bd14eaf72d43f63d90700cd1b0fa049ca (diff) | |
download | pdfium-a5d7ad3aa8feb08a14b5cca173d673054c1ade23.tar.xz |
Introduce FX_Number class as a replacement for FX_atonum().
The issue with FX_atonum() is that it doesn't return any information
about whether it range-checked its integer values as a signed or
unsigned type, even though it knows this as part of its processing.
Rather than adding another out parameter to that function, create
a class to hold all this information together.
This is the first place things went astray while diagnosing
bug 882959, in that a large positive value was cast to float as a
negative value. Unfortunately, this doesn't affect the related bug,
but is a step in the right direction.
Change-Id: I0977ec8fccf85e2632a962507bdd30a1cbe6d33c
Reviewed-on: https://pdfium-review.googlesource.com/42353
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/page/cpdf_streamcontentparser.h')
-rw-r--r-- | core/fpdfapi/page/cpdf_streamcontentparser.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h index a129894dba..6417043305 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.h +++ b/core/fpdfapi/page/cpdf_streamcontentparser.h @@ -15,6 +15,7 @@ #include "core/fpdfapi/page/cpdf_contentmark.h" #include "core/fpdfapi/parser/cpdf_stream.h" +#include "core/fxcrt/fx_number.h" #include "core/fxcrt/fx_string.h" #include "core/fxge/cfx_pathdata.h" @@ -71,13 +72,7 @@ class CPDF_StreamContentParser { Type m_Type; std::unique_ptr<CPDF_Object> m_pObject; - struct { - bool m_bInteger; - union { - int m_Integer; - float m_Float; - }; - } m_Number; + FX_Number m_Number; struct { int m_Len; char m_Buffer[32]; |