From 3acb1ef909a22368507ed13817c4988c818e3aee Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 9 Oct 2015 13:51:05 -0700 Subject: Sanitize CJBig2_SymbolDict's memory usage. - Use std::vector instead of storing pointers to arrays. - Make CJBig2_SymbolDict's members private with accessors. - Use std::vector in related places. - Steal Chromium's vector_as_array() and use it as an adaptor as needed. BUG=514891 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1388203003 . --- third_party/BUILD.gn | 1 + third_party/base/stl_util.h | 27 +++++++++++++++++++++++++++ third_party/third_party.gyp | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 third_party/base/stl_util.h (limited to 'third_party') diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 21d3d5db32..f6358147be 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -300,6 +300,7 @@ source_set("pdfium_base") { "base/numerics/safe_conversions_impl.h", "base/numerics/safe_math.h", "base/numerics/safe_math_impl.h", + "base/stl_util.h", "base/template_util.h", ] } diff --git a/third_party/base/stl_util.h b/third_party/base/stl_util.h new file mode 100644 index 0000000000..fcbe5882a2 --- /dev/null +++ b/third_party/base/stl_util.h @@ -0,0 +1,27 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef PDFIUM_THIRD_PARTY_BASE_STL_UTIL_H_ +#define PDFIUM_THIRD_PARTY_BASE_STL_UTIL_H_ + +#include + +namespace pdfium { + +// To treat a possibly-empty vector as an array, use these functions. +// If you know the array will never be empty, you can use &*v.begin() +// directly, but that is undefined behaviour if |v| is empty. +template +inline T* vector_as_array(std::vector* v) { + return v->empty() ? nullptr : &*v->begin(); +} + +template +inline const T* vector_as_array(const std::vector* v) { + return v->empty() ? nullptr : &*v->begin(); +} + +} // namespace pdfium + +#endif // PDFIUM_THIRD_PARTY_BASE_STL_UTIL_H_ diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 6ad8beb48c..1ec0509eb2 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -281,11 +281,12 @@ 'base/logging.h', 'base/macros.h', 'base/nonstd_unique_ptr.h', - 'base/template_util.h', 'base/numerics/safe_conversions.h', 'base/numerics/safe_conversions_impl.h', 'base/numerics/safe_math.h', 'base/numerics/safe_math_impl.h', + 'base/stl_util.h', + 'base/template_util.h', ], }, ], -- cgit v1.2.3