From 1099b29f5569004f8a83be93dbe0c31a3620a9e5 Mon Sep 17 00:00:00 2001 From: thestig Date: Mon, 15 Aug 2016 11:40:17 -0700 Subject: Fix a potential integer overflow in TT2PDF(). BUG=635438 Review-Url: https://codereview.chromium.org/2248473002 --- core/fpdfapi/fpdf_font/fpdf_font.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp index fefe936543..a14c43d4fa 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp @@ -19,13 +19,15 @@ #include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxge/include/fx_freetype.h" +#include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/stl_util.h" int TT2PDF(int m, FXFT_Face face) { int upm = FXFT_Get_Face_UnitsPerEM(face); if (upm == 0) return m; - return (m * 1000 + upm / 2) / upm; + return pdfium::base::checked_cast( + (static_cast(m) * 1000 + upm / 2) / upm); } bool FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { -- cgit v1.2.3