Fix error checking for QueueLeaves and AddSequencedLeaves in the PostgreSQL storage backend (#3752)

robstradling · web-flow · commit 23c833b1a401 · 2025-03-13T19:52:23.000Z
diff --git a/storage/postgresql/log_storage.go b/storage/postgresql/log_storage.go
@@ -457,7 +457,7 @@ func (t *logTreeTX) QueueLeaves(ctx context.Context, leaves []*trillian.LogLeaf,
 			}
 			toRetrieve = append(toRetrieve, leafIdentityHash)
 		}
-		if rows.Err() != nil {
+		if err = rows.Err(); err != nil {
 			klog.Errorf("Failed processing rows: %s", err)
 			return nil, postgresqlToGRPC(err)
 		}
@@ -559,7 +559,7 @@ func (t *logTreeTX) AddSequencedLeaves(ctx context.Context, leaves []*trillian.L
 				res[i].Status = status.New(codes.FailedPrecondition, "conflicting LeafIndex").Proto()
 			}
 		}
-		if rows.Err() != nil {
+		if err = rows.Err(); err != nil {
 			klog.Errorf("Error processing rows: %s", err)
 			return nil, postgresqlToGRPC(err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ func (t logTreeTX) QueueLeaves(ctx context.Context, leaves []trillian.LogLeaf,`
`457`	`457`	`}`
`458`	`458`	`toRetrieve = append(toRetrieve, leafIdentityHash)`
`459`	`459`	`}`
`460`		`- if rows.Err() != nil {`
	`460`	`+ if err = rows.Err(); err != nil {`
`461`	`461`	`klog.Errorf("Failed processing rows: %s", err)`
`462`	`462`	`return nil, postgresqlToGRPC(err)`
`463`	`463`	`}`
`@@ -559,7 +559,7 @@ func (t logTreeTX) AddSequencedLeaves(ctx context.Context, leaves []trillian.L`
`559`	`559`	`res[i].Status = status.New(codes.FailedPrecondition, "conflicting LeafIndex").Proto()`
`560`	`560`	`}`
`561`	`561`	`}`
`562`		`- if rows.Err() != nil {`
	`562`	`+ if err = rows.Err(); err != nil {`
`563`	`563`	`klog.Errorf("Error processing rows: %s", err)`
`564`	`564`	`return nil, postgresqlToGRPC(err)`
`565`	`565`	`}`