Merge "WifiScoreCard: catch IllegalArgumentException when SSID > 32 bytes" into rvc-qpr-dev

1 files changed, 8 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiScoreCard.java b/service/java/com/android/server/wifi/WifiScoreCard.java
index 64da835f0..2ab5fb466 100644
--- a/service/java/com/android/server/wifi/WifiScoreCard.java
+++ b/service/java/com/android/server/wifi/WifiScoreCard.java
@@ -1689,11 +1689,18 @@ public class WifiScoreCard {
      * @return
      */
     public static long computeHashLong(String ssid, MacAddress mac, String l2KeySeed) {
+        final ArrayList<Byte> decodedSsid;
+        try {
+            decodedSsid = NativeUtil.decodeSsid(ssid);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "NativeUtil.decodeSsid failed: malformed string: " + ssid);
+            return 0;
+        }
         byte[][] parts = {
                 // Our seed keeps the L2Keys specific to this device
                 l2KeySeed.getBytes(),
                 // ssid is either quoted utf8 or hex-encoded bytes; turn it into plain bytes.
-                NativeUtil.byteArrayFromArrayList(NativeUtil.decodeSsid(ssid)),
+                NativeUtil.byteArrayFromArrayList(decodedSsid),
                 // And the BSSID
                 mac.toByteArray()
         };