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

Merge pull request #4176 from phire/fix_wii_input_display_string 

Movie: Fix null pointer dereference.
This commit is contained in:
shuffle2 2016-10-02 20:59:30 -07:00 committed by GitHub
parent 07f672f81b a32bb8f1b9
commit 25f983cb21
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Movie.cpp
View File

@ -784,15 +784,15 @@ static void SetWiiInputDisplayString(int remoteID, u8* const data,
display_str += " 2";
if (buttons.home)
display_str += " HOME";
}
if (accelData)
{
wm_accel* dt = (wm_accel*)accelData;
display_str +=
StringFromFormat(" ACC:%d,%d,%d", dt->x << 2 | ((wm_buttons*)coreData)->acc_x_lsb,
dt->y << 2 | ((wm_buttons*)coreData)->acc_y_lsb << 1,
dt->z << 2 | ((wm_buttons*)coreData)->acc_z_lsb << 1);
// A few bits of accelData are actually inside the coreData struct.
if (accelData)
{
wm_accel* dt = (wm_accel*)accelData;
display_str += StringFromFormat(" ACC:%d,%d,%d", dt->x << 2 | buttons.acc_x_lsb,
dt->y << 2 | buttons.acc_y_lsb << 1,
dt->z << 2 | buttons.acc_z_lsb << 1);
}
}
if (irData)