Fix max array size (#39)

* Fix max array size

 <mahboobe.haddadi@cafebazaar.ir>

Author: mahboobehad

README.md

@@ -16,7 +16,7 @@ Bundle signer is a command-line tool. You need to install **Java 8 or above** to
 shows how to generate signed binary file of your bundle application assuming you are using Java keystore to sign APK
 files of your application:
 ```sh  
-java -jar bundlesigner-0.1.12.jar genbin  -v --bundle app.aab --bin .  --v2-signing-enabled true --v3-signing-enabled false --ks key.jks   
+java -jar bundlesigner-0.1.13.jar genbin  -v --bundle app.aab --bin .  --v2-signing-enabled true --v3-signing-enabled false --ks key.jks   
 ```
 This generates signed digest of the provided bundle. The output of this command is a binary file that contains signed 
 digest of all APK files that can be extracted from the bundle. Signing is performed using one or more signers, each 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>ir.cafebazaar</groupId>
     <artifactId>bundlesigner</artifactId>
-    <version>0.1.12</version>
+    <version>0.1.13</version>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>

src/main/java/ir/cafebazaar/apksig/internal/util/ByteArrayDataSink.java

@@ -101,11 +101,13 @@ private void ensureAvailable(int minAvailable) throws IOException {
         if (minCapacity <= mArray.length) {
             return;
         }
-        if (minCapacity > Integer.MAX_VALUE) {
+        int memoryGuard = 1024;
+        int maxArraySize = Integer.MAX_VALUE - memoryGuard;
+        if (minCapacity > maxArraySize) {
             throw new IOException(
-                    "Required capacity too large: " + minCapacity + ", max: " + Integer.MAX_VALUE);
+                    "Required capacity too large: " + minCapacity + ", max: " + maxArraySize);
         }
-        int doubleCurrentSize = (int) Math.min(mArray.length * 2L, Integer.MAX_VALUE);
+        int doubleCurrentSize = (int) Math.min(mArray.length * 2L, maxArraySize);
         int newSize = (int) Math.max(minCapacity, doubleCurrentSize);
         mArray = Arrays.copyOf(mArray, newSize);
     }

src/main/java/ir/cafebazaar/bundlesigner/BundleSignerTool.java

@@ -167,9 +167,14 @@ public static void main(String[] params) throws Exception {
             exitMessage = e.getMessage() + "\n" + Arrays.toString(e.getStackTrace());
             exitCode = 4;
 
-        } finally {
-            if (!exitMessage.isEmpty())
+        } catch (OutOfMemoryError e){
+            exitMessage = e.getMessage() + "\n" + Arrays.toString(e.getStackTrace());
+            exitCode = 9;
+        }finally {
+            if (!exitMessage.isEmpty()) {
                 System.err.println(exitMessage);
+                logger.info(exitMessage);
+            }
             System.exit(exitCode);
         }
     }

src/main/java/ir/cafebazaar/bundlesigner/command/GenBinCommand.java

@@ -118,12 +118,12 @@ public void execute() throws Exception {
         logger.info("started genbin command.");
         String apksPath = BundleToolWrapper.buildApkSet(bundle, TMP_DIR_PATH, false);
         String universalPath = BundleToolWrapper.buildApkSet(bundle, TMP_DIR_PATH, true);
+        System.gc();
 
         File binV1 = new File(TMP_DIR_PATH + File.separator + "binv1");
         File binV2V3 = new File(TMP_DIR_PATH + File.separator + "binv2_v3");
 
         extractAndSignApkSet(apksPath, binV1, binV2V3);
-
         extractAndSignApkSet(universalPath, binV1, binV2V3);
 
         generateFinalBinFile(binV1, binV2V3);
@@ -144,6 +144,7 @@ private void extractAndSignApkSet(String apksPath, File binV1, File binV2V3) thr
         for (FileHeader apkSetEntry : apkSetEntries) {
             if (!apkSetEntry.getFileName().contains("apk"))
                 continue;
+            logger.info("signing " + apkSetEntry.getFileName());
 
             File apk = new File(TMP_DIR_PATH + File.separator + apkSetEntry.getFileName());
             new File(apk.getParent()).mkdirs();
@@ -152,6 +153,7 @@ private void extractAndSignApkSet(String apksPath, File binV1, File binV2V3) thr
             apkName = apkName.replace("/", "_");
 
             calculateSignOfApk(apkName, binV1, binV2V3, apk);
+            logger.info("signed " + apkSetEntry.getFileName());
         }
     }
 

src/main/resources/log4j.properties

@@ -1,5 +1,4 @@
 log4j.rootLogger=INFO, file
-
 log4j.appender.file=org.apache.log4j.RollingFileAppender
 log4j.appender.file.File=${java.io.tmpdir}/bundlesigner.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout