aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2020-04-22 14:59:38 +0200
committerGitHub <noreply@github.com>2020-04-22 14:59:38 +0200
commitf9fae000b09cf1457e280e95a95f8b775497211e (patch)
treee4197b64ffe392fa121744d05e2704ae8fbb34a8
parent61df1c38e0ca751fd0b015fdf5070af7bcaf2d7e (diff)
parent10a34ffd6e29c0c396c56d315ef53f010a02a505 (diff)
Merge pull request #13013 from vespa-engine/toregge/fix-datastore-buffer-type-test-buffer-overflow
Fix buffer overflow in vespalib datastore buffer type test.
-rw-r--r--vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp
index 6a51b9192ce..3b748d1d4c7 100644
--- a/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp
+++ b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp
@@ -36,19 +36,19 @@ struct Fixture {
Setup setup;
IntBufferType bufferType;
size_t deadElems;
- int buffer;
+ int buffer[ARRAYS_SIZE];
Fixture(const Setup &setup_)
: setup(setup_),
bufferType(ARRAYS_SIZE, setup._minArrays, MAX_ARRAYS, NUM_ARRAYS_FOR_NEW_BUFFER, setup._allocGrowFactor),
deadElems(0),
- buffer(0)
+ buffer()
{}
~Fixture() {
bufferType.onHold(&setup._usedElems);
bufferType.onFree(setup._usedElems);
}
void onActive() {
- bufferType.onActive(setup._bufferId, &setup._usedElems, deadElems, &buffer);
+ bufferType.onActive(setup._bufferId, &setup._usedElems, deadElems, &buffer[0]);
}
size_t arraysToAlloc() {
return bufferType.calcArraysToAlloc(setup._bufferId, setup._neededElems, setup._resizing);