summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-09 13:57:36 -0700
committerLei Zhang <thestig@chromium.org>2015-10-09 13:57:36 -0700
commit5428555d7bca8116fa8c6d6914674f2c2adb17ac (patch)
treef8217f4229aa6eecc33134a0c8ab9013b20e7fc6 /third_party
parente7bd5081be68feb4978659a0c18090314ff44d09 (diff)
downloadpdfium-5428555d7bca8116fa8c6d6914674f2c2adb17ac.tar.xz
Merge to XFA: Sanitize CJBig2_SymbolDict's memory usage.
- Use std::vector<JBig2ArithCtx> instead of storing pointers to arrays. - Make CJBig2_SymbolDict's members private with accessors. - Use std::vector<JBig2ArithCtx> in related places. - Steal Chromium's vector_as_array() and use it as an adaptor as needed. BUG=514891 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1388203003 . (cherry picked from commit 3acb1ef909a22368507ed13817c4988c818e3aee) Review URL: https://codereview.chromium.org/1401533004 .
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD.gn1
-rw-r--r--third_party/base/stl_util.h27
-rw-r--r--third_party/third_party.gyp3
3 files changed, 30 insertions, 1 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 8e143aa348..27b602379f 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -273,6 +273,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 <vector>
+
+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 <typename T>
+inline T* vector_as_array(std::vector<T>* v) {
+ return v->empty() ? nullptr : &*v->begin();
+}
+
+template <typename T>
+inline const T* vector_as_array(const std::vector<T>* 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 79368b5a68..df5341d44a 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -265,11 +265,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',
],
},
],