Skip to content

feat: Prevent panic from nil pointer dereference in swap IBC handler #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Senna46 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Prevent panic from nil pointer dereference in swap IBC handler #308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9ffb6
fix: type error
Senna46 Sep 23, 2025
49b61eb
fix: add nil check
Senna46 Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions x/swap/keeper/ibc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (k Keeper) OnAcknowledgementOutgoingInFlightPacket(
// The pattern of waitingPacket.Return == nil is not handled here
switch t := incomingPacket.Change.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexChange:
if t.OutgoingIndexChange.Equal(outgoingPacket.Index) {
if t.OutgoingIndexChange != nil && t.OutgoingIndexChange.Equal(outgoingPacket.Index) {
incomingPacket.Change = &types.IncomingInFlightPacket_AckChange{
AckChange: acknowledgement,
}
Expand All @@ -274,7 +274,7 @@ func (k Keeper) OnAcknowledgementOutgoingInFlightPacket(
// The pattern of waitingPacket.Forward == nil is not handled here
switch t := incomingPacket.Forward.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexForward:
if t.OutgoingIndexForward.Equal(outgoingPacket.Index) {
if t.OutgoingIndexForward != nil && t.OutgoingIndexForward.Equal(outgoingPacket.Index) {
incomingPacket.Forward = &types.IncomingInFlightPacket_AckForward{
AckForward: acknowledgement,
}
Expand Down Expand Up @@ -348,7 +348,7 @@ func (k Keeper) OnTimeoutOutgoingInFlightPacket(

switch packetReturn := waitingPacket.Change.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexChange:
if packetReturn.OutgoingIndexChange.Equal(outgoingPacket.Index) {
if packetReturn.OutgoingIndexChange != nil && packetReturn.OutgoingIndexChange.Equal(outgoingPacket.Index) {
waitingPacket.Change = &types.IncomingInFlightPacket_AckChange{
AckChange: ack.Acknowledgement(),
}
Expand All @@ -358,7 +358,7 @@ func (k Keeper) OnTimeoutOutgoingInFlightPacket(

switch packetForward := waitingPacket.Forward.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexForward:
if packetForward.OutgoingIndexForward.Equal(outgoingPacket.Index) {
if packetForward.OutgoingIndexForward != nil && packetForward.OutgoingIndexForward.Equal(outgoingPacket.Index) {
waitingPacket.Forward = &types.IncomingInFlightPacket_AckForward{
AckForward: ack.Acknowledgement(),
}
Expand Down Expand Up @@ -388,26 +388,26 @@ func (k Keeper) ShouldDeleteCompletedWaitingPacket(
switch packet.Change.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexChange:
return false, nil
case *types.IncomingInFlightPacket_AckChange:
case *types.IncomingInFlightPacket_AckChange, nil:
break
}

switch packet.Forward.(type) {
case *types.IncomingInFlightPacket_OutgoingIndexForward:
return false, nil
case *types.IncomingInFlightPacket_AckForward:
case *types.IncomingInFlightPacket_AckForward, nil:
break
}

var changeAck []byte = nil
var forwardAck []byte = nil

if packet.Change != nil {
changeAck = packet.Change.(*types.IncomingInFlightPacket_AckChange).AckChange
if ack, ok := packet.Change.(*types.IncomingInFlightPacket_AckChange); ok && ack != nil {
changeAck = ack.AckChange
}

if packet.Forward != nil {
forwardAck = packet.Forward.(*types.IncomingInFlightPacket_AckForward).AckForward
if ack, ok := packet.Forward.(*types.IncomingInFlightPacket_AckForward); ok && ack != nil {
forwardAck = ack.AckForward
}

fullAck := types.SwapAcknowledgement{
Expand Down