moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-26 06:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash if we get a short read from the Xbox One controller

Browse Source
This commit is contained in:
Cameron Gutman 2020-12-24 11:59:33 -06:00
parent 57b507ad50
commit bdac2df4b9
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java
View File

@ -66,8 +66,8 @@ public class Xbox360Controller extends AbstractXboxController {
@Override @Override
protected boolean handleRead(ByteBuffer buffer) { protected boolean handleRead(ByteBuffer buffer) {
if (buffer.limit() < 14) { if (buffer.remaining() < 14) {
LimeLog.severe("Read too small: "+buffer.limit()); LimeLog.severe("Read too small: "+buffer.remaining());
return false; return false;
} }

10
app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java
View File

@ -101,11 +101,21 @@ public class XboxOneController extends AbstractXboxController {
switch (buffer.get()) switch (buffer.get())
{ {
case 0x20: case 0x20:
if (buffer.remaining() < 17) {
LimeLog.severe("XBone button/axis read too small: "+buffer.remaining());
return false;
}
buffer.position(buffer.position()+3); buffer.position(buffer.position()+3);
processButtons(buffer); processButtons(buffer);
return true; return true;
case 0x07: case 0x07:
if (buffer.remaining() < 4) {
LimeLog.severe("XBone mode read too small: "+buffer.remaining());
return false;
}
// The Xbox One S controller needs acks for mode reports otherwise // The Xbox One S controller needs acks for mode reports otherwise
// it retransmits them forever. // it retransmits them forever.
if (buffer.get() == 0x30) { if (buffer.get() == 0x30) {