src/pefile.cpp: cleanup reloc handling and add more checks

src/util/raw_bytes.h

@@ -35,11 +35,9 @@
 
 // default: for any regular pointer, raw_bytes() is just the pointer itself
 template <class T>
-inline typename std::enable_if<std::is_pointer<T>::value && !upx::is_bounded_array<T>::value &&
-                                   (upx_is_integral<typename std::remove_pointer<T>::type>::value ||
-                                    std::is_void<typename std::remove_pointer<T>::type>::value),
-                               T>::type
-raw_bytes(T ptr, size_t size_in_bytes) {
+inline
+    typename std::enable_if<std::is_pointer<T>::value && !upx::is_bounded_array<T>::value, T>::type
+    raw_bytes(T ptr, size_t size_in_bytes) {
     if (size_in_bytes > 0) {
         if very_unlikely (ptr == nullptr)
             throwCantPack("raw_bytes unexpected NULL ptr");
@@ -53,7 +51,7 @@ raw_bytes(T ptr, size_t size_in_bytes) {
 // NOTE: index == number of elements, *NOT* size in bytes!
 template <class T>
 inline typename std::enable_if<std::is_pointer<T>::value && !upx::is_bounded_array<T>::value &&
-                                   upx_is_integral<typename std::remove_pointer<T>::type>::value,
+                                   !std::is_void<typename std::remove_pointer<T>::type>::value,
                                T>::type
 raw_index_bytes(T ptr, size_t index, size_t size_in_bytes) {
     typedef typename std::remove_pointer<T>::type element_type;

src/util/xspan_impl_ptr.h

@@ -125,6 +125,13 @@ public:
         return assign(Self(other));
     }
 
+    template <class U>
+    CSelf<U> type_cast() const {
+        assertInvariants();
+        typedef CSelf<U> R;
+        return R(reinterpret_cast<typename R::pointer>(ptr));
+    }
+
     // comparison
 
     bool operator==(pointer other) const { return ptr == other; }