Merge pull request #2874 from bnb-chain/release_v1.5.4-beta

merge v1.5.4-beta back to develop branch
bnb-chain · Feb 5, 2025 · 9330440 · 9330440
2 parents 4376943 + a58f0fc
commit 9330440
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## v1.5.4
+NA
+
 ## v1.5.3
 ### BUGFIX
 * [\#2827](https://github.com/bnb-chain/bsc/pull/2827) triedb/pathdb: fix nil field for stateSet

diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -212,6 +212,9 @@ func UnmarshalPubkey(pub []byte) (*ecdsa.PublicKey, error) {
 	if x == nil {
 		return nil, errInvalidPubkey
 	}
+	if !S256().IsOnCurve(x, y) {
+		return nil, errInvalidPubkey
+	}
 	return &ecdsa.PublicKey{Curve: S256(), X: x, Y: y}, nil
 }
 

diff --git a/version/version.go b/version/version.go
@@ -19,6 +19,6 @@ package version
 const (
 	Major = 1  // Major version component of the current release
 	Minor = 5  // Minor version component of the current release
-	Patch = 3  // Patch version component of the current release
+	Patch = 4  // Patch version component of the current release
 	Meta  = "" // Version metadata to append to the version string
 )