Check for null query when decoding device link uri

[signal-cli] / src / main / java / org / asamk / signal / manager / DeviceLinkInfo.java

diff --git a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
index 5b9fbe2809eb581739879882034c88ce61bed76a..779642b6333b419ab73de848cb922f39f6e0ce62 100644 (file)
--- 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");