Merge pull request #4457 from leoetlino/btemu-eslaunch-fix

IPC_HLE: Fix emulated BT crash (uninitialised memory)
dolphin-emu · Nov 19, 2016 · 171bb14 · 171bb14
2 parents d3710d5 + 165e3a9
commit 171bb14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.cpp
@@ -82,7 +82,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305_base::CtrlBuffer::CtrlBuffer(const SIOCtlVBu
 void CWII_IPC_HLE_Device_usb_oh1_57e_305_base::CtrlBuffer::FillBuffer(const u8* src,
                                                                       const size_t size) const
 {
-  _dbg_assert_msg_(WII_IPC_WIIMOTE, size <= m_length, "FillBuffer: size %li > payload length %i",
-                   size, m_length);
+  _assert_msg_(WII_IPC_WIIMOTE, size <= m_length, "FillBuffer: size %li > payload length %i", size,
+               m_length);
   Memory::CopyToEmu(m_payload_addr, src, size);
 }
diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_base.h
@@ -58,13 +58,13 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305_base : public IWII_IPC_HLE_Device
     CtrlMessage() = default;
     CtrlMessage(const SIOCtlVBuffer& cmd_buffer);
 
-    u8 request_type;
-    u8 request;
-    u16 value;
-    u16 index;
-    u16 length;
-    u32 payload_addr;
-    u32 address;
+    u8 request_type = 0;
+    u8 request = 0;
+    u16 value = 0;
+    u16 index = 0;
+    u16 length = 0;
+    u32 payload_addr = 0;
+    u32 address = 0;
   };
 
   class CtrlBuffer
@@ -77,9 +77,9 @@ class CWII_IPC_HLE_Device_usb_oh1_57e_305_base : public IWII_IPC_HLE_Device
     void SetRetVal(const u32 retval) const { Memory::Write_U32(retval, m_cmd_address + 4); }
     bool IsValid() const { return m_cmd_address != 0; }
     void Invalidate() { m_cmd_address = m_payload_addr = 0; }
-    u8 m_endpoint;
-    u16 m_length;
-    u32 m_payload_addr;
-    u32 m_cmd_address;
+    u8 m_endpoint = 0;
+    u16 m_length = 0;
+    u32 m_payload_addr = 0;
+    u32 m_cmd_address = 0;
   };
 };