From cafa6b51251af5c2a23787e8daf9da8e4d35373f Mon Sep 17 00:00:00 2001 From: Emmanuel T Odeke Date: Tue, 1 Nov 2022 01:24:41 -0700 Subject: [PATCH] fix: x/group/internal/orm: return iterator close errors (#13714) Instead of nakedly always returning nil, instead return the actual close errors. Fixes https://github.com/cosmos/cosmos-sdk/security/code-scanning/6295 Fixes https://github.com/cosmos/cosmos-sdk/security/code-scanning/6296 --- x/group/internal/orm/index.go | 3 +-- x/group/internal/orm/table.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/x/group/internal/orm/index.go b/x/group/internal/orm/index.go index 2c4cc21911..ceb44bbf3c 100644 --- a/x/group/internal/orm/index.go +++ b/x/group/internal/orm/index.go @@ -256,8 +256,7 @@ func (i indexIterator) LoadNext(dest codec.ProtoMarshaler) (RowID, error) { // Close releases the iterator and should be called at the end of iteration func (i indexIterator) Close() error { - i.it.Close() - return nil + return i.it.Close() } // PrefixRange turns a prefix into a (start, end) range. The start is the given prefix value and diff --git a/x/group/internal/orm/table.go b/x/group/internal/orm/table.go index e21b15ef61..d505927e85 100644 --- a/x/group/internal/orm/table.go +++ b/x/group/internal/orm/table.go @@ -308,6 +308,5 @@ func (i typeSafeIterator) LoadNext(dest codec.ProtoMarshaler) (RowID, error) { } func (i typeSafeIterator) Close() error { - i.it.Close() - return nil + return i.it.Close() }