src: major cleanups, introduce new eXtended Span class
- initial minimally invasive eXtended Span implementation - rename ptr_diff to ptr_diff_bytes - move some files to util subdir - lots of cleanups - start using the new checked pointers - this needs some real-world testing
This commit is contained in:
Markus F.X.J. Oberhumer
@@ -0,0 +1,293 @@
|
||||
/* xspan -- a minimally invasive checked memory smart pointer
|
||||
|
||||
This file is part of the UPX executable compressor.
|
||||
|
||||
Copyright (C) 1996-2022 Markus Franz Xaver Johannes Oberhumer
|
||||
All Rights Reserved.
|
||||
|
||||
UPX and the UCL library are free software; you can redistribute them
|
||||
and/or modify them under the terms of the GNU General Public License as
|
||||
published by the Free Software Foundation; either version 2 of
|
||||
the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; see the file COPYING.
|
||||
If not, write to the Free Software Foundation, Inc.,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
Markus F.X.J. Oberhumer
|
||||
<markus@oberhumer.com>
|
||||
*/
|
||||
|
||||
// manually forward a number of well-known functions using a
|
||||
// checked "raw_bytes()" call
|
||||
|
||||
#define SPAN_FWD_TU(RType) \
|
||||
template <class T, class U> \
|
||||
inline SPAN_REQUIRES_CONVERTIBLE_ANY_DIRECTION(T, U, RType)
|
||||
|
||||
/*************************************************************************
|
||||
// overloads for standard functions
|
||||
**************************************************************************/
|
||||
|
||||
template <class T>
|
||||
inline void *memchr(const C<T> &a, int c, size_t n) {
|
||||
return memchr(a.raw_bytes(n), c, n);
|
||||
}
|
||||
template <class T>
|
||||
inline const void *memchr(const C<const T> &a, int c, size_t n) {
|
||||
return memchr(a.raw_bytes(n), c, n);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline int memcmp(const C<T> &a, const void *b, size_t n) {
|
||||
return memcmp(a.raw_bytes(n), b, n);
|
||||
}
|
||||
template <class T>
|
||||
inline int memcmp(const void *a, const C<T> &b, size_t n) {
|
||||
return memcmp(a, b.raw_bytes(n), n);
|
||||
}
|
||||
SPAN_FWD_TU(int) memcmp(const C<T> &a, const C<U> &b, size_t n) {
|
||||
return memcmp(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#ifdef D
|
||||
SPAN_FWD_TU(int) memcmp(const C<T> &a, const D<U> &b, size_t n) {
|
||||
return memcmp(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
#ifdef E
|
||||
SPAN_FWD_TU(int) memcmp(const C<T> &a, const E<U> &b, size_t n) {
|
||||
return memcmp(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
|
||||
template <class T>
|
||||
inline void *memcpy(C<T> a, const void *b, size_t n) {
|
||||
return memcpy(a.raw_bytes(n), b, n);
|
||||
}
|
||||
template <class T>
|
||||
inline void *memcpy(void *a, const C<T> &b, size_t n) {
|
||||
return memcpy(a, b.raw_bytes(n), n);
|
||||
}
|
||||
SPAN_FWD_TU(void *) memcpy(const C<T> &a, const C<U> &b, size_t n) {
|
||||
return memcpy(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#ifdef D
|
||||
SPAN_FWD_TU(void *) memcpy(const C<T> &a, const D<U> &b, size_t n) {
|
||||
return memcpy(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
#ifdef E
|
||||
SPAN_FWD_TU(void *) memcpy(const C<T> &a, const E<U> &b, size_t n) {
|
||||
return memcpy(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
|
||||
template <class T>
|
||||
inline void *memmove(C<T> a, const void *b, size_t n) {
|
||||
return memmove(a.raw_bytes(n), b, n);
|
||||
}
|
||||
template <class T>
|
||||
inline void *memmove(void *a, const C<T> &b, size_t n) {
|
||||
return memmove(a, b.raw_bytes(n), n);
|
||||
}
|
||||
SPAN_FWD_TU(void *) memmove(const C<T> &a, const C<U> &b, size_t n) {
|
||||
return memmove(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#ifdef D
|
||||
SPAN_FWD_TU(void *) memmove(const C<T> &a, const D<U> &b, size_t n) {
|
||||
return memmove(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
#ifdef E
|
||||
SPAN_FWD_TU(void *) memmove(const C<T> &a, const E<U> &b, size_t n) {
|
||||
return memmove(a.raw_bytes(n), b.raw_bytes(n), n);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*************************************************************************
|
||||
// overloads for UPX extras
|
||||
**************************************************************************/
|
||||
|
||||
template <class T>
|
||||
inline int ptr_diff_bytes(const C<T> &a, const void *b) {
|
||||
return ptr_diff_bytes(a.raw_bytes(0), b);
|
||||
}
|
||||
template <class T>
|
||||
inline int ptr_diff_bytes(const void *a, const C<T> &b) {
|
||||
return ptr_diff_bytes(a, b.raw_bytes(0));
|
||||
}
|
||||
SPAN_FWD_TU(int) ptr_diff_bytes(const C<T> &a, const C<U> &b) {
|
||||
return ptr_diff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#ifdef D
|
||||
SPAN_FWD_TU(int) ptr_diff_bytes(const C<T> &a, const D<U> &b) {
|
||||
return ptr_diff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#endif
|
||||
#ifdef E
|
||||
SPAN_FWD_TU(int) ptr_diff_bytes(const C<T> &a, const E<U> &b) {
|
||||
return ptr_diff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#endif
|
||||
|
||||
template <class T>
|
||||
inline unsigned ptr_udiff_bytes(const C<T> &a, const void *b) {
|
||||
return ptr_udiff_bytes(a.raw_bytes(0), b);
|
||||
}
|
||||
template <class T>
|
||||
inline unsigned ptr_udiff_bytes(const void *a, const C<T> &b) {
|
||||
return ptr_udiff_bytes(a, b.raw_bytes(0));
|
||||
}
|
||||
SPAN_FWD_TU(unsigned) ptr_udiff_bytes(const C<T> &a, const C<U> &b) {
|
||||
return ptr_udiff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#ifdef D
|
||||
SPAN_FWD_TU(unsigned) ptr_udiff_bytes(const C<T> &a, const D<U> &b) {
|
||||
return ptr_udiff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#endif
|
||||
#ifdef E
|
||||
SPAN_FWD_TU(unsigned) ptr_udiff_bytes(const C<T> &a, const E<U> &b) {
|
||||
return ptr_udiff_bytes(a.raw_bytes(0), b.raw_bytes(0));
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef UPX_VERSION_HEX
|
||||
|
||||
template <class T>
|
||||
unsigned get_ne16(const C<T> &a) {
|
||||
return get_ne16(a.raw_bytes(2));
|
||||
}
|
||||
template <class T>
|
||||
unsigned get_ne32(const C<T> &a) {
|
||||
return get_ne32(a.raw_bytes(4));
|
||||
}
|
||||
template <class T>
|
||||
upx_uint64_t get_ne64(const C<T> &a) {
|
||||
return get_ne64(a.raw_bytes(8));
|
||||
}
|
||||
|
||||
template <class T>
|
||||
unsigned get_be16(const C<T> &a) {
|
||||
return get_be16(a.raw_bytes(2));
|
||||
}
|
||||
template <class T>
|
||||
unsigned get_be32(const C<T> &a) {
|
||||
return get_be32(a.raw_bytes(4));
|
||||
}
|
||||
template <class T>
|
||||
upx_uint64_t get_be64(const C<T> &a) {
|
||||
return get_be64(a.raw_bytes(8));
|
||||
}
|
||||
|
||||
template <class T>
|
||||
unsigned get_le16(const C<T> &a) {
|
||||
return get_le16(a.raw_bytes(2));
|
||||
}
|
||||
template <class T>
|
||||
unsigned get_le24(const C<T> &a) {
|
||||
return get_le24(a.raw_bytes(3));
|
||||
}
|
||||
template <class T>
|
||||
unsigned get_le32(const C<T> &a) {
|
||||
return get_le32(a.raw_bytes(4));
|
||||
}
|
||||
template <class T>
|
||||
upx_uint64_t get_le64(const C<T> &a) {
|
||||
return get_le64(a.raw_bytes(8));
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void set_ne16(const C<T> &a, unsigned v) {
|
||||
return set_ne16(a.raw_bytes(2), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_ne32(const C<T> &a, unsigned v) {
|
||||
return set_ne32(a.raw_bytes(4), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_ne64(const C<T> &a, upx_uint64_t v) {
|
||||
return set_ne64(a.raw_bytes(8), v);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void set_be16(const C<T> &a, unsigned v) {
|
||||
return set_be16(a.raw_bytes(2), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_be32(const C<T> &a, unsigned v) {
|
||||
return set_be32(a.raw_bytes(4), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_be64(const C<T> &a, upx_uint64_t v) {
|
||||
return set_be64(a.raw_bytes(8), v);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
void set_le16(const C<T> &a, unsigned v) {
|
||||
return set_le16(a.raw_bytes(2), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_le24(const C<T> &a, unsigned v) {
|
||||
return set_le24(a.raw_bytes(3), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_le32(const C<T> &a, unsigned v) {
|
||||
return set_le32(a.raw_bytes(4), v);
|
||||
}
|
||||
template <class T>
|
||||
void set_le64(const C<T> &a, upx_uint64_t v) {
|
||||
return set_le64(a.raw_bytes(8), v);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline C<T> operator+(const C<T> &a, const BE16 &v) {
|
||||
return a + unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator+(const C<T> &a, const BE32 &v) {
|
||||
return a + unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator+(const C<T> &a, const LE16 &v) {
|
||||
return a + unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator+(const C<T> &a, const LE32 &v) {
|
||||
return a + unsigned(v);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline C<T> operator-(const C<T> &a, const BE16 &v) {
|
||||
return a - unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator-(const C<T> &a, const BE32 &v) {
|
||||
return a - unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator-(const C<T> &a, const LE16 &v) {
|
||||
return a - unsigned(v);
|
||||
}
|
||||
template <class T>
|
||||
inline C<T> operator-(const C<T> &a, const LE32 &v) {
|
||||
return a - unsigned(v);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
typename std::enable_if<sizeof(T) == 1, upx_rsize_t>::type upx_safe_strlen(const C<T> &a) {
|
||||
// not fully checked, but can require at least 1 byte
|
||||
return upx_safe_strlen(a.raw_bytes(1));
|
||||
}
|
||||
|
||||
#endif // UPX_VERSION_HEX
|
||||
|
||||
#undef SPAN_FWD_TU
|
||||
|
||||
/* vim:set ts=4 sw=4 et: */
|
||||
Reference in New Issue
Block a user