From: AsamK <asamk@gmx.de>
Date: Sun, 10 Jan 2021 21:31:18 +0000 (+0100)
Subject: Check for null query when decoding device link uri
X-Git-Tag: v0.7.3~44
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/6c8a1ff3d30b7973b9459ffa4da4c7345d14defd

Check for null query when decoding device link uri
---

diff --git a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
index 5b9fbe28..779642b6 100644
--- a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
+++ b/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
@@ -21,7 +21,12 @@ public class DeviceLinkInfo {
     final ECPublicKey deviceKey;
 
     public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws IOException, InvalidKeyException {
-        Map<String, String> query = getQueryMap(linkUri.getRawQuery());
+        final String rawQuery = linkUri.getRawQuery();
+        if (isEmpty(rawQuery)) {
+            throw new RuntimeException("Invalid device link uri");
+        }
+
+        Map<String, String> query = getQueryMap(rawQuery);
         String deviceIdentifier = query.get("uuid");
         String publicKeyEncoded = query.get("pub_key");