From 518aeb38b94c3a88d2bfca67747888cdd1e1b4d9 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 21 Feb 2023 13:29:35 +0000 Subject: [PATCH] Check that BluetoothSocket's input and output streams aren't null. --- .../bluetooth/AndroidBluetoothTransportConnection.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java index accc2ea5d..297c11021 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java @@ -33,8 +33,10 @@ class AndroidBluetoothTransportConnection super(plugin); this.connectionLimiter = connectionLimiter; this.socket = socket; - in = timeoutMonitor.createTimeoutInputStream( - socket.getInputStream(), plugin.getMaxIdleTime() * 2); + InputStream socketIn = socket.getInputStream(); + if (socketIn == null) throw new IOException(); + in = timeoutMonitor.createTimeoutInputStream(socketIn, + plugin.getMaxIdleTime() * 2L); wakeLock = wakeLockManager.createWakeLock("BluetoothConnection"); wakeLock.acquire(); String address = socket.getRemoteDevice().getAddress(); @@ -48,7 +50,9 @@ class AndroidBluetoothTransportConnection @Override protected OutputStream getOutputStream() throws IOException { - return socket.getOutputStream(); + OutputStream socketOut = socket.getOutputStream(); + if (socketOut == null) throw new IOException(); + return socketOut; } @Override