nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-14 00:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

kern: correct error in KUserPointer

Browse source
This commit is contained in:
Michael Scire 2020-02-22 15:38:31 -08:00
parent 34fb48b412
commit 3e4c962bbb
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/libmesosphere/include/mesosphere/svc/kern_svc_k_user_pointer.hpp
View file

@ -116,9 +116,10 @@ namespace ams::kern::svc {
private: private:
using Traits = KUserPointerImplTraits<_T>; using Traits = KUserPointerImplTraits<_T>;
protected: protected:
using T = typename std::remove_const<typename std::remove_pointer<_T>::type>::type; using CT = typename std::remove_pointer<_T>::type;
using T = typename std::remove_const<CT>::type;
private: private:
_T *ptr; CT *ptr;
private: private:
Result CopyToImpl(void *p, size_t size) const { Result CopyToImpl(void *p, size_t size) const {
return Traits::CopyFromUserspace(p, this->ptr, size); return Traits::CopyFromUserspace(p, this->ptr, size);
@ -138,6 +139,8 @@ namespace ams::kern::svc {
Result CopyArrayFrom(const T *arr, size_t count) const { return this->CopyFromImpl(arr, sizeof(*arr) * count); } Result CopyArrayFrom(const T *arr, size_t count) const { return this->CopyFromImpl(arr, sizeof(*arr) * count); }
constexpr bool IsNull() const { return this->ptr == nullptr; } constexpr bool IsNull() const { return this->ptr == nullptr; }
constexpr CT *GetUnsafePointer() const { return this->ptr; }
}; };
template<> template<>
@ -145,7 +148,8 @@ namespace ams::kern::svc {
private: private:
using Traits = KUserPointerImplTraits<const char *>; using Traits = KUserPointerImplTraits<const char *>;
protected: protected:
using T = char; using CT = const char;
using T = char;
private: private:
const char *ptr; const char *ptr;
protected: protected:
@ -160,6 +164,8 @@ namespace ams::kern::svc {
} }
constexpr bool IsNull() const { return this->ptr == nullptr; } constexpr bool IsNull() const { return this->ptr == nullptr; }
constexpr const char *GetUnsafePointer() const { return this->ptr; }
}; };
} }
@ -176,6 +182,8 @@ namespace ams::kern::svc {
using impl::KUserPointerImpl<T>::CopyArrayElementTo; using impl::KUserPointerImpl<T>::CopyArrayElementTo;
using impl::KUserPointerImpl<T>::CopyArrayTo; using impl::KUserPointerImpl<T>::CopyArrayTo;
using impl::KUserPointerImpl<T>::IsNull; using impl::KUserPointerImpl<T>::IsNull;
using impl::KUserPointerImpl<T>::GetUnsafePointer;
}; };
template<typename T> /* requires impl::NonConstPointer<T> */ template<typename T> /* requires impl::NonConstPointer<T> */
@ -187,6 +195,8 @@ namespace ams::kern::svc {
using impl::KUserPointerImpl<T>::CopyArrayElementFrom; using impl::KUserPointerImpl<T>::CopyArrayElementFrom;
using impl::KUserPointerImpl<T>::CopyArrayFrom; using impl::KUserPointerImpl<T>::CopyArrayFrom;
using impl::KUserPointerImpl<T>::IsNull; using impl::KUserPointerImpl<T>::IsNull;
using impl::KUserPointerImpl<T>::GetUnsafePointer;
}; };
template<> template<>
@ -197,6 +207,8 @@ namespace ams::kern::svc {
using impl::KUserPointerImpl<const char *>::CopyStringTo; using impl::KUserPointerImpl<const char *>::CopyStringTo;
using impl::KUserPointerImpl<const char *>::CopyArrayElementTo; using impl::KUserPointerImpl<const char *>::CopyArrayElementTo;
using impl::KUserPointerImpl<const char *>::IsNull; using impl::KUserPointerImpl<const char *>::IsNull;
using impl::KUserPointerImpl<const char *>::GetUnsafePointer;
}; };
} }