dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix integer overflow resulting in item lose

Browse Source
This commit is contained in:
MelanX
2022-04-11 20:33:16 +02:00
committed by Raoul
parent bdb51e0d21
commit c66a17452c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java
View File

@@ -95,13 +95,14 @@ public class FluidStorageDisk implements IStorageDisk<FluidStack> {
return StackUtils.copy(otherStack, size - remainingSpace); return StackUtils.copy(otherStack, size - remainingSpace);
} else { } else {
int maxConsumable = Math.min(size, Integer.MAX_VALUE - otherStack.getAmount());
if (action == Action.PERFORM) { if (action == Action.PERFORM) {
otherStack.grow(size); otherStack.grow(maxConsumable);
onChanged(); onChanged();
} }
return FluidStack.EMPTY; return StackUtils.copy(otherStack, size - maxConsumable);
} }
} }
} }

7
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java
View File

@@ -102,14 +102,15 @@ public class ItemStorageDisk implements IStorageDisk<ItemStack> {
return ItemHandlerHelper.copyStackWithSize(otherStack, size - remainingSpace); return ItemHandlerHelper.copyStackWithSize(otherStack, size - remainingSpace);
} else { } else {
int maxConsumable = Math.min(size, Integer.MAX_VALUE - otherStack.getCount());
if (action == Action.PERFORM) { if (action == Action.PERFORM) {
otherStack.grow(size); otherStack.grow(maxConsumable);
itemCount += size; itemCount += maxConsumable;
onChanged(); onChanged();
} }
return ItemStack.EMPTY; return ItemHandlerHelper.copyStackWithSize(otherStack, size - maxConsumable);
} }
} }
} }