Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: core/fpdfapi/fpdf_parser/cpdf_number.cpp

Issue 2250533002: Fix stack overflow in object Clone() functions (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: rebase again Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_null.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_object.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h" 7 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
8 8
9 CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {} 9 CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {}
10 10
11 CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {} 11 CPDF_Number::CPDF_Number(int value) : m_bInteger(true), m_Integer(value) {}
12 12
13 CPDF_Number::CPDF_Number(FX_FLOAT value) : m_bInteger(false), m_Float(value) {} 13 CPDF_Number::CPDF_Number(FX_FLOAT value) : m_bInteger(false), m_Float(value) {}
14 14
15 CPDF_Number::CPDF_Number(const CFX_ByteStringC& str) 15 CPDF_Number::CPDF_Number(const CFX_ByteStringC& str)
16 : m_bInteger(FX_atonum(str, &m_Integer)) {} 16 : m_bInteger(FX_atonum(str, &m_Integer)) {}
17 17
18 CPDF_Number::~CPDF_Number() {} 18 CPDF_Number::~CPDF_Number() {}
19 19
20 CPDF_Object::Type CPDF_Number::GetType() const { 20 CPDF_Object::Type CPDF_Number::GetType() const {
21 return NUMBER; 21 return NUMBER;
22 } 22 }
23 23
24 CPDF_Object* CPDF_Number::Clone(FX_BOOL bDirect) const { 24 CPDF_Object* CPDF_Number::Clone() const {
25 return m_bInteger ? new CPDF_Number(m_Integer) : new CPDF_Number(m_Float); 25 return m_bInteger ? new CPDF_Number(m_Integer) : new CPDF_Number(m_Float);
26 } 26 }
27 27
28 FX_FLOAT CPDF_Number::GetNumber() const { 28 FX_FLOAT CPDF_Number::GetNumber() const {
29 return m_bInteger ? static_cast<FX_FLOAT>(m_Integer) : m_Float; 29 return m_bInteger ? static_cast<FX_FLOAT>(m_Integer) : m_Float;
30 } 30 }
31 31
32 int CPDF_Number::GetInteger() const { 32 int CPDF_Number::GetInteger() const {
33 return m_bInteger ? m_Integer : static_cast<int>(m_Float); 33 return m_bInteger ? m_Integer : static_cast<int>(m_Float);
34 } 34 }
(...skipping 11 matching lines...) Expand all
46 } 46 }
47 47
48 void CPDF_Number::SetString(const CFX_ByteString& str) { 48 void CPDF_Number::SetString(const CFX_ByteString& str) {
49 m_bInteger = FX_atonum(str.AsStringC(), &m_Integer); 49 m_bInteger = FX_atonum(str.AsStringC(), &m_Integer);
50 } 50 }
51 51
52 CFX_ByteString CPDF_Number::GetString() const { 52 CFX_ByteString CPDF_Number::GetString() const {
53 return m_bInteger ? CFX_ByteString::FormatInteger(m_Integer, FXFORMAT_SIGNED) 53 return m_bInteger ? CFX_ByteString::FormatInteger(m_Integer, FXFORMAT_SIGNED)
54 : CFX_ByteString::FormatFloat(m_Float); 54 : CFX_ByteString::FormatFloat(m_Float);
55 } 55 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_null.cpp ('k') | core/fpdfapi/fpdf_parser/cpdf_object.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698