Skip to content

Fix integer overflow with max limit & batchsize #1810

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix integer overflow with max limit & batchsize #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb6afd7
Fix integer overflow with max limit & batchsize
rozza Sep 24, 2025
3b2d0d8
Merge branch 'main' into JAVA-5970
rozza Sep 24, 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
2 changes: 1 addition & 1 deletion driver-core/src/main/com/mongodb/internal/operation/FindOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ private BsonDocument getCommand(final OperationContext operationContext, final i
commandDocument.put("limit", new BsonInt32(Math.abs(batchSize)));
} else if (batchSize != 0) {
int effectiveBatchSize = Math.abs(batchSize);
if (effectiveBatchSize == limit) {
if (effectiveBatchSize == limit && effectiveBatchSize < Integer.MAX_VALUE) {
// avoid an open cursor on server side when batchSize and limit are equal
effectiveBatchSize++;
}
Expand Down
21 changes: 21 additions & 0 deletions ...r-core/src/test/unit/com/mongodb/internal/operation/FindOperationUnitSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,27 @@ class FindOperationUnitSpecification extends OperationUnitSpecification {
version << [[3, 2, 0]] * 10 + [[3, 4, 0]] * 10
}

def 'should find with correct command with effective batch size'() {
when:
def operation = new FindOperation<BsonDocument>(namespace, new BsonDocumentCodec())
.batchSize(batchSize)
.limit(limit)

def expectedCommand = new BsonDocument('find', new BsonString(namespace.getCollectionName()))
.append('batchSize', new BsonInt32(commandBatchSize))
.append('limit', new BsonInt32(commandLimit))

then:
testOperation(operation, [7, 0, 0], expectedCommand, async, commandResult)

where:
async << [true, true, false, false]
batchSize << [10, Integer.MAX_VALUE] * 2
limit << [10, Integer.MAX_VALUE] * 2
commandLimit << [10, Integer.MAX_VALUE] * 2
commandBatchSize << [11, Integer.MAX_VALUE] * 2
}

def 'should use the readPreference to set secondaryOk for commands'() {
when:
def operation = new FindOperation<Document>(namespace, new DocumentCodec())
Expand Down