Merge pull request #7392 from adiabat/hltcinterceptfix

HTLC Interceptor: Fix nil pointer dereference
This commit is contained in:
Oliver Gugger 2023-02-13 11:43:29 +01:00 committed by GitHub
commit 0c5971ba9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View File

@ -125,6 +125,9 @@ current gossip sync query status.
update in order to use the new versioned RPC and upgrade any on-chain outputs
to the new version.
* [A bug has been fixed which could cause `lnd` to crash when parsing a
malformed HTLC intercept message](https://github.com/lightningnetwork/lnd/pull/7392).
## Wallet
* [Allows Taproot public keys and tap scripts to be imported as watch-only

View File

@ -100,6 +100,11 @@ func (r *forwardInterceptor) onIntercept(
func (r *forwardInterceptor) resolveFromClient(
in *ForwardHtlcInterceptResponse) error {
if in.IncomingCircuitKey == nil {
return status.Errorf(codes.InvalidArgument,
"CircuitKey missing from ForwardHtlcInterceptResponse")
}
log.Tracef("Resolving intercepted packet %v", in)
circuitKey := models.CircuitKey{