Merge pull request #545 from YangSen-qn/master

fix file source read memory overflow

Author: xwen-winnie

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 7.9.4 (2022-01-27)
+### 对象存储
+* 修复大于 2G 的文件上传读取分片信息时数据溢出问题
+* 接口全面支持 Qiniu 签名
 
 ## 7.9.3 (2022-01-27)
 ### 对象存储

src/main/java/com/qiniu/common/Constants.java

@@ -9,7 +9,7 @@ public final class Constants {
     /**
      * 版本号
      */
-    public static final String VERSION = "7.9.3";
+    public static final String VERSION = "7.9.4";
     /**
      * 块大小，不能改变
      */

src/main/java/com/qiniu/storage/ResumeUploadSourceFile.java

@@ -28,9 +28,9 @@ private void createBlockList(Configuration config, long fileSize, int blockSize)
         long offset = 0;
         int blockIndex = 0;
         while (offset < fileSize) {
-            int lastSize = (int) (fileSize - offset);
-            int blockSizeP = Math.min(lastSize, blockSize);
-            Block block = new Block(config, offset, blockSizeP, blockIndex);
+            long lastSize = fileSize - offset;
+            long blockSizeP = Math.min(lastSize, (long)blockSize);
+            Block block = new Block(config, offset, (int)blockSizeP, blockIndex);
             blockList.add(block);
             offset += blockSizeP;
             blockIndex += 1;