DROID-340: Java interface - In BRCoreAddress limit addresses to 35 characters

Ed Gamble · Ed Gamble · commit 23a44863a997 · 2018-03-07T18:19:59.000-08:00
diff --git a/Java/com_breadwallet_core_BRCoreAddress.c b/Java/com_breadwallet_core_BRCoreAddress.c
@@ -37,7 +37,11 @@ Java_com_breadwallet_core_BRCoreAddress_createCoreAddress
     BRAddress *address = (BRAddress *) calloc (1, sizeof (BRAddress));
 
     size_t stringLen = (size_t) (*env)->GetStringLength (env, stringObject);
-    //assert (stringLen <= 36);
+    size_t stringLenMax = sizeof (address->s) - 1;
+
+    // Do not overflow address->s
+    if (stringLen > stringLenMax)
+        stringLen = stringLenMax;
 
     const char *stringChars = (const char *) (*env)->GetStringUTFChars (env, stringObject, 0);
     memcpy(address->s, stringChars, stringLen);
diff --git a/Java/root/com/breadwallet/core/test/BRWalletManager.java b/Java/root/com/breadwallet/core/test/BRWalletManager.java
@@ -278,6 +278,7 @@ private static void runKeyTests() {
         System.out.println("            " + key.address());
 
         addr1 = new BRCoreAddress(key.address());
+        assert (addr1.isValid());
 
         byte[] script = addr1.getPubKeyScript();
 
@@ -294,6 +295,16 @@ private static void runKeyTests() {
         String bitcoinAddr3 = BRCoreAddress.bcashDecodeBitcoin("bitcoincash:qzfhn2f7dwsfqdf6nlu07rw6c3ssqe9rm5a5y8tgm9");
         assert (null != bitcoinAddr3 && !bitcoinAddr3.isEmpty());
 
+        System.out.println (" Mihail's BCH: " + "bitcoincash:qzc93708k7x0w3gr32thxc5fla38xf8x8vq8h33fva");
+        System.out.println (" Mihail's BTC: " + BRCoreAddress.bcashDecodeBitcoin("bitcoincash:qzc93708k7x0w3gr32thxc5fla38xf8x8vq8h33fva"));
+
+        BRCoreAddress addrX1 = new BRCoreAddress(
+                "bitcoincash:qzc93708k7x0w3gr32thxc5fla38xf8x8vq8h33fva");
+        assert (!addrX1.isValid());
+        BRCoreAddress addrX2 = new BRCoreAddress(
+                BRCoreAddress.bcashDecodeBitcoin("bitcoincash:qzc93708k7x0w3gr32thxc5fla38xf8x8vq8h33fva"));
+        assert (addrX2.isValid());
+
         //
         //
         //
