Merge pull request #274 from CosmWasm/prevent_overflow

Prevent integer overflow
2020-10-07 14:50:35 +02:00
parent 3571625d9a 5fbf4ae7c7
commit ad4262a344
1 changed files with 4 additions and 1 deletions
--- a/x/wasm/internal/keeper/keeper.go
+++ b/x/wasm/internal/keeper/keeper.go
@@ -559,7 +559,10 @@ func (k Keeper) dispatchMessages(ctx sdk.Context, contractAddr sdk.AccAddress, m

 func gasForContract(ctx sdk.Context) uint64 {
 	meter := ctx.GasMeter()
-	remaining := (meter.Limit() - meter.GasConsumed()) * GasMultiplier
+	if meter.IsOutOfGas() {
+		return 0
+	}
+	remaining := (meter.Limit() - meter.GasConsumedToLimit()) * GasMultiplier
 	if remaining > MaxGas {
 		return MaxGas
 	}