ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix AppendParam dereferencing NULL pointers

This commit is contained in:
Dr. Chat 2015-06-25 19:29:37 -05:00
parent 862028f26f
commit 287a761987
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/xenia/kernel/util/shim_utils.h
View File

@ -329,18 +329,28 @@ inline void AppendParam(StringBuffer& string_buffer, lpvoid_t param) {
string_buffer.AppendFormat("%.8X", uint32_t(param));
}
inline void AppendParam(StringBuffer& string_buffer, lpdword_t param) {
string_buffer.AppendFormat("%.8X(%.8X)", param.guest_address(),
param.value());
string_buffer.AppendFormat("%.8X", param.guest_address());
if (param) {
string_buffer.AppendFormat("(%.8X)", param.value());
}
}
inline void AppendParam(StringBuffer& string_buffer, lpqword_t param) {
string_buffer.AppendFormat("%.8X(%.16llX)", param.guest_address(),
param.value());
string_buffer.AppendFormat("%.8X", param.guest_address());
if (param) {
string_buffer.AppendFormat("(%.16llX)", param.value());
}
}
inline void AppendParam(StringBuffer& string_buffer, lpfloat_t param) {
string_buffer.AppendFormat("%.8X(%G)", param.guest_address(), param.value());
string_buffer.AppendFormat("%.8X", param.guest_address());
if (param) {
string_buffer.AppendFormat("(%G)", param.value());
}
}
inline void AppendParam(StringBuffer& string_buffer, lpdouble_t param) {
string_buffer.AppendFormat("%.8X(%G)", param.guest_address(), param.value());
string_buffer.AppendFormat("%.8X", param.guest_address());
if (param) {
string_buffer.AppendFormat("(%G)", param.value());
}
}
template <typename T>
void AppendParam(StringBuffer& string_buffer, pointer_t<T> param) {