Merge branch 'master' of https://github.com/cosmos/cosmos-sdk into li…

…khita/rename-legacy-to-migrations
cosmos · Jul 5, 2021 · 62bdfc8 · 62bdfc8
2 parents e884105 + 7f90374
commit 62bdfc8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* (types) [\#9627](https://github.com/cosmos/cosmos-sdk/pull/9627) Fix nil pointer panic on `NewBigIntFromInt`
 * (x/genutil) [\#9574](https://github.com/cosmos/cosmos-sdk/pull/9575) Actually use the `gentx` client tx flags (like `--keyring-dir`)
 
 

diff --git a/types/int.go b/types/int.go
@@ -101,8 +101,13 @@ func NewIntFromUint64(n uint64) Int {
 	return Int{b}
 }
 
-// NewIntFromBigInt constructs Int from big.Int
+// NewIntFromBigInt constructs Int from big.Int. If the provided big.Int is nil,
+// it returns an empty instance. This function panics if the bit length is > 256.
 func NewIntFromBigInt(i *big.Int) Int {
+	if i == nil {
+		return Int{}
+	}
+
 	if i.BitLen() > maxBitLen {
 		panic("NewIntFromBigInt() out of bound")
 	}

diff --git a/types/int_test.go b/types/int_test.go
@@ -91,6 +91,9 @@ func (s *intTestSuite) TestIntPanic() {
 	s.Require().Panics(func() { intmax.Add(sdk.OneInt()) })
 	s.Require().Panics(func() { intmin.Sub(sdk.OneInt()) })
 
+	s.Require().NotPanics(func() { sdk.NewIntFromBigInt(nil) })
+	s.Require().True(sdk.NewIntFromBigInt(nil).IsNil())
+
 	// Division-by-zero check
 	s.Require().Panics(func() { i1.Quo(sdk.NewInt(0)) })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,6 +64,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

		### Bug Fixes

		* (types) [\#9627](https://github.com/cosmos/cosmos-sdk/pull/9627) Fix nil pointer panic on `NewBigIntFromInt`
		* (x/genutil) [\#9574](https://github.com/cosmos/cosmos-sdk/pull/9575) Actually use the `gentx` client tx flags (like `--keyring-dir`)


Expand Down