[#443] Avoid integer overflow

akvo · May 31, 2016 · d613eac · d613eac
1 parent 324710c
commit d613eac
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/src/main/java/org/akvo/flow/api/S3Api.java b/app/src/main/java/org/akvo/flow/api/S3Api.java
@@ -126,8 +126,10 @@ public void get(String objectKey, File dst) throws IOException {
     }
 
     public boolean put(String objectKey, File file, String type, boolean isPublic) throws IOException {
+        // Calculate data size, up to 2 GB
+        final int size = file.length() < Integer.MAX_VALUE ? (int)file.length() : -1;
+
         // Get date and signature
-        final int size = (int)file.length();// long version was added on API level 19
         final byte[] rawMd5 = FileUtil.getMD5Checksum(file);
         final String md5Base64 = Base64.encodeToString(rawMd5, Base64.NO_WRAP);
         final String md5Hex = FileUtil.hexMd5(rawMd5);
@@ -143,7 +145,11 @@ public boolean put(String objectKey, File file, String type, boolean isPublic) t
         try {
             conn = (HttpURLConnection) url.openConnection();
             conn.setDoOutput(true);
-            conn.setFixedLengthStreamingMode(size);
+            if (size > 0) {
+                conn.setFixedLengthStreamingMode(size);
+            } else {
+                conn.setChunkedStreamingMode(0);
+            }
             conn.setRequestMethod("PUT");
             conn.setRequestProperty("Content-MD5", md5Base64);
             conn.setRequestProperty("Content-Type", type);