3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-17 08:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

minidump: stronger checking for MinidumpWritableAtRVA<>().

Browse Source 
MinidumpWritableAtRVA<>() now checks that the object of the requested
type is actually in the range of the minidump file’s size, rather than
just checking that the beginning of the object is in range.

TEST=minidump_test
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/708803002
This commit is contained in:
Mark Mentovai 2014-11-06 16:47:57 -05:00
parent 48b1964d1b
commit 8ad3beccdb
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
minidump/test/minidump_writable_test_util.cc
View File

@ -23,6 +23,20 @@
namespace crashpad { namespace crashpad {
namespace test { namespace test {
namespace {
//! \brief Returns an untyped minidump object located within a minidump file’s
//! contents, where the offset of the object is known.
//!
//! \param[in] file_contents The contents of the minidump file.
//! \param[in] rva The offset within the minidump file of the desired object.
//!
//! \return If \a rva is within the range of \a file_contents, returns a pointer
//! into \a file_contents at offset \a rva. Otherwise, raises a gtest
//! assertion failure and returns `nullptr`.
//!
//! Do not call this function. Use the typed version, MinidumpWritableAtRVA<>(),
//! or another type-specific function.
const void* MinidumpWritableAtRVAInternal(const std::string& file_contents, const void* MinidumpWritableAtRVAInternal(const std::string& file_contents,
RVA rva) { RVA rva) {
if (rva >= file_contents.size()) { if (rva >= file_contents.size()) {
@ -33,6 +47,8 @@ const void* MinidumpWritableAtRVAInternal(const std::string& file_contents,
return &file_contents[rva]; return &file_contents[rva];
} }
} // namespace
const void* MinidumpWritableAtLocationDescriptorInternal( const void* MinidumpWritableAtLocationDescriptorInternal(
const std::string& file_contents, const std::string& file_contents,
const MINIDUMP_LOCATION_DESCRIPTOR& location, const MINIDUMP_LOCATION_DESCRIPTOR& location,

56
minidump/test/minidump_writable_test_util.h
View File

@ -26,23 +26,6 @@
namespace crashpad { namespace crashpad {
namespace test { namespace test {
//! \brief Returns an untyped minidump object located within a minidump file’s
//! contents, where the offset of the object is known.
//!
//! \param[in] file_contents The contents of the minidump file.
//! \param[in] rva The offset within the minidump file of the desired object.
//!
//! \return If \a rva is within the range of \a file_contents, returns a pointer
//! into \a file_contents at offset \a rva. Otherwise, raises a gtest
//! assertion failure and returns `nullptr`.
//!
//! Do not call this function. Use the typed version, MinidumpWritableAtRVA<>(),
//! or another type-specific function.
//!
//! \sa MinidumpWritableAtLocationDescriptorInternal()
const void* MinidumpWritableAtRVAInternal(const std::string& file_contents,
RVA rva);
//! \brief Returns an untyped minidump object located within a minidump file’s //! \brief Returns an untyped minidump object located within a minidump file’s
//! contents, where the offset and size of the object are known. //! contents, where the offset and size of the object are known.
//! //!
@ -64,8 +47,6 @@ const void* MinidumpWritableAtRVAInternal(const std::string& file_contents,
//! //!
//! Do not call this function. Use the typed version, //! Do not call this function. Use the typed version,
//! MinidumpWritableAtLocationDescriptor<>(), or another type-specific function. //! MinidumpWritableAtLocationDescriptor<>(), or another type-specific function.
//!
//! \sa MinidumpWritableAtRVAInternal()
const void* MinidumpWritableAtLocationDescriptorInternal( const void* MinidumpWritableAtLocationDescriptorInternal(
const std::string& file_contents, const std::string& file_contents,
const MINIDUMP_LOCATION_DESCRIPTOR& location, const MINIDUMP_LOCATION_DESCRIPTOR& location,
@ -119,23 +100,6 @@ MINIDUMP_ALLOW_OVERSIZED_DATA(uint8_t);
#undef MINIDUMP_ALLOW_OVERSIZED_DATA #undef MINIDUMP_ALLOW_OVERSIZED_DATA
//! \brief Returns a typed minidump object located within a minidump file’s
//! contents, where the offset of the object is known.
//!
//! \param[in] file_contents The contents of the minidump file.
//! \param[in] rva The offset within the minidump file of the desired object.
//!
//! \return If \a rva is within the range of \a file_contents, returns a pointer
//! into \a file_contents at offset \a rva. Otherwise, raises a gtest
//! assertion failure and returns `nullptr`.
//!
//! \sa MinidumpWritableAtLocationDescriptor<>()
template <typename T>
const T* MinidumpWritableAtRVA(const std::string& file_contents, RVA rva) {
return reinterpret_cast<const T*>(
MinidumpWritableAtRVAInternal(file_contents, rva));
}
//! \brief Returns a typed minidump object located within a minidump file’s //! \brief Returns a typed minidump object located within a minidump file’s
//! contents, where the offset and size of the object are known. //! contents, where the offset and size of the object are known.
//! //!
@ -241,6 +205,26 @@ MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
const std::string& file_contents, const std::string& file_contents,
const MINIDUMP_LOCATION_DESCRIPTOR& location); const MINIDUMP_LOCATION_DESCRIPTOR& location);
//! \brief Returns a typed minidump object located within a minidump file’s
//! contents, where the offset of the object is known.
//!
//! \param[in] file_contents The contents of the minidump file.
//! \param[in] rva The offset within the minidump file of the desired object.
//!
//! \return If \a rva plus the size of an object of type \a T is within the
//! range of \a file_contents, returns a pointer into \a file_contents at
//! offset \a rva. Otherwise, raises a gtest assertion failure and returns
//! `nullptr`.
//!
//! \sa MinidumpWritableAtLocationDescriptor<>()
template <typename T>
const T* MinidumpWritableAtRVA(const std::string& file_contents, RVA rva) {
MINIDUMP_LOCATION_DESCRIPTOR location;
location.DataSize = sizeof(T);
location.Rva = rva;
return MinidumpWritableAtLocationDescriptor<T>(file_contents, location);
}
} // namespace test } // namespace test
} // namespace crashpad } // namespace crashpad