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

Side by Side Diff: core/fpdfapi/fpdf_font/fpdf_font.cpp

Issue 2248473002: Fix a potential integer overflow in TT2PDF(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@fontclean_smallrect
Patch Set: rebase 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 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_font/font_int.h" 7 #include "core/fpdfapi/fpdf_font/font_int.h"
8 8
9 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" 9 #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
10 #include "core/fpdfapi/fpdf_page/include/cpdf_form.h" 10 #include "core/fpdfapi/fpdf_page/include/cpdf_form.h"
11 #include "core/fpdfapi/fpdf_page/pageint.h" 11 #include "core/fpdfapi/fpdf_page/pageint.h"
12 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" 12 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
13 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" 13 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
14 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" 14 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
15 #include "core/fpdfapi/fpdf_parser/include/cpdf_name.h" 15 #include "core/fpdfapi/fpdf_parser/include/cpdf_name.h"
16 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h" 16 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
17 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" 17 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
18 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" 18 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
19 #include "core/fpdfapi/include/cpdf_modulemgr.h" 19 #include "core/fpdfapi/include/cpdf_modulemgr.h"
20 #include "core/fxcrt/include/fx_ext.h" 20 #include "core/fxcrt/include/fx_ext.h"
21 #include "core/fxge/include/fx_freetype.h" 21 #include "core/fxge/include/fx_freetype.h"
22 #include "third_party/base/numerics/safe_conversions.h"
22 #include "third_party/base/stl_util.h" 23 #include "third_party/base/stl_util.h"
23 24
24 int TT2PDF(int m, FXFT_Face face) { 25 int TT2PDF(int m, FXFT_Face face) {
25 int upm = FXFT_Get_Face_UnitsPerEM(face); 26 int upm = FXFT_Get_Face_UnitsPerEM(face);
26 if (upm == 0) 27 if (upm == 0)
27 return m; 28 return m;
28 return (m * 1000 + upm / 2) / upm; 29 return pdfium::base::checked_cast<int>(
30 (static_cast<double>(m) * 1000 + upm / 2) / upm);
29 } 31 }
30 32
31 bool FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { 33 bool FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) {
32 auto* pCharMap = FXFT_Get_Face_Charmaps(face); 34 auto* pCharMap = FXFT_Get_Face_Charmaps(face);
33 for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) { 35 for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) {
34 if (FXFT_Get_Charmap_PlatformID(pCharMap[i]) == platform_id && 36 if (FXFT_Get_Charmap_PlatformID(pCharMap[i]) == platform_id &&
35 FXFT_Get_Charmap_EncodingID(pCharMap[i]) == encoding_id) { 37 FXFT_Get_Charmap_EncodingID(pCharMap[i]) == encoding_id) {
36 FXFT_Set_Charmap(face, pCharMap[i]); 38 FXFT_Set_Charmap(face, pCharMap[i]);
37 return true; 39 return true;
38 } 40 }
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 } 296 }
295 if (cid_set) { 297 if (cid_set) {
296 m_pBaseMap = CPDF_ModuleMgr::Get() 298 m_pBaseMap = CPDF_ModuleMgr::Get()
297 ->GetPageModule() 299 ->GetPageModule()
298 ->GetFontGlobals() 300 ->GetFontGlobals()
299 ->m_CMapManager.GetCID2UnicodeMap(cid_set, FALSE); 301 ->m_CMapManager.GetCID2UnicodeMap(cid_set, FALSE);
300 } else { 302 } else {
301 m_pBaseMap = nullptr; 303 m_pBaseMap = nullptr;
302 } 304 }
303 } 305 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698