From 875f1ce7a9a78e226ac75dbd9162b5de022c294a Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Sat, 13 Aug 2022 11:42:01 +0200
Subject: [PATCH] Add null checks

---
 .../java/com/emanuelef/remote_capture/MitmReceiver.java    | 7 ++++++-
 .../activities/ConnectionDetailsActivity.java              | 2 ++
 .../emanuelef/remote_capture/activities/MainActivity.java  | 2 +-
 .../emanuelef/remote_capture/adapters/PayloadAdapter.java  | 2 ++
 .../remote_capture/fragments/ConnectionPayload.java        | 2 +-
 .../remote_capture/model/ConnectionDescriptor.java         | 3 ++-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
index dfbab7ad..b3ee0aa0 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/MitmReceiver.java
@@ -180,8 +180,13 @@ public class MitmReceiver implements Runnable, ConnectionsListener, MitmListener
 
     @Override
     public void run() {
-        Log.d(TAG, "Receiving data...");
+        if(mSocketFd == null) {
+            Log.d(TAG, "Null socket, abort");
+            mProxyRunning = false;
+            return;
+        }
 
+        Log.d(TAG, "Receiving data...");
         try(DataInputStream istream = new DataInputStream(new ParcelFileDescriptor.AutoCloseInputStream(mSocketFd))) {
             while(mAddon.isConnected()) {
                 String msg_type;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/ConnectionDetailsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/ConnectionDetailsActivity.java
index c258c573..45bdd810 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/ConnectionDetailsActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/ConnectionDetailsActivity.java
@@ -268,6 +268,8 @@ public class ConnectionDetailsActivity extends BaseActivity implements Connectio
 
         for(int i=mCurChunks; i<max_check; i++) {
             PayloadChunk chunk = mConn.getPayloadChunk(i);
+            if(chunk == null)
+                continue;
 
             if(!mHasHttpTab && (chunk.type == PayloadChunk.ChunkType.HTTP)) {
                 mHasHttpTab = true;
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
index 15e926a7..0347897a 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
@@ -815,7 +815,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
                     deleted = (getContentResolver().delete(pcapUri, null, null) == 1);
                 else
                     deleted = DocumentsContract.deleteDocument(getContentResolver(), pcapUri);
-            } catch (FileNotFoundException | UnsupportedOperationException e) {
+            } catch (FileNotFoundException | UnsupportedOperationException | SecurityException e) {
                 e.printStackTrace();
             }
 
diff --git a/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java b/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
index b0cb8101..fa8a1469 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/adapters/PayloadAdapter.java
@@ -338,6 +338,8 @@ public class PayloadAdapter extends RecyclerView.Adapter<PayloadAdapter.PayloadV
     public void handleChunksAdded(int tot_chunks) {
         for(int i = mHandledChunks; i<tot_chunks; i++) {
             PayloadChunk chunk = mConn.getPayloadChunk(i);
+            if(chunk == null)
+                continue;
 
             // Exclude unrelated chunks
             if((mMode != ChunkType.RAW) && (mMode != chunk.type))
diff --git a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
index 67617a6b..e6df8cc2 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionPayload.java
@@ -188,7 +188,7 @@ public class ConnectionPayload extends Fragment implements ConnectionDetailsActi
             return mConn.l7proto.equals("HTTPS");
 
         PayloadChunk firstChunk = mConn.getPayloadChunk(0);
-        if(firstChunk.type == PayloadChunk.ChunkType.HTTP)
+        if((firstChunk == null) || (firstChunk.type == PayloadChunk.ChunkType.HTTP))
             return true;
 
         // guess based on the actual data
diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
index 7c82fd4b..46e060dc 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/model/ConnectionDescriptor.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.emanuelef.remote_capture.AppsResolver;
 import com.emanuelef.remote_capture.CaptureService;
@@ -296,7 +297,7 @@ public class ConnectionDescriptor {
 
     public int getNumPayloadChunks() { return (payload_chunks == null) ? 0 : payload_chunks.size(); }
 
-    public PayloadChunk getPayloadChunk(int idx) {
+    public @Nullable PayloadChunk getPayloadChunk(int idx) {
         if(getNumPayloadChunks() <= idx)
             return null;
         return payload_chunks.get(idx);