diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-07-25 05:18:00 +0900 |
|---|---|---|
| committer | Keisuke Kuroyanagi <ksk@google.com> | 2014-07-25 07:02:10 +0900 |
| commit | d4c9d50ef07494ed96d448a1e26df637a64232dd (patch) | |
| tree | 1e206b3f454746f5b0a2dbd70c54fe4248d46134 /native/jni/src | |
| parent | ff6ca09905be7e50828100301f23c68d56dcea2b (diff) | |
| download | latinime-d4c9d50ef07494ed96d448a1e26df637a64232dd.tar.gz latinime-d4c9d50ef07494ed96d448a1e26df637a64232dd.tar.xz latinime-d4c9d50ef07494ed96d448a1e26df637a64232dd.zip | |
Add BufferWithExtendablebufferTest
Bug: 13754552
Change-Id: Ib9c330dc85bdb5d4d3d5bc15cc3ce5f28faa0b12
Diffstat (limited to 'native/jni/src')
| -rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp index fab7208de..825b72c6a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp @@ -102,8 +102,9 @@ bool BufferWithExtendableBuffer::writeCodePointsAndAdvancePosition(const int *co bool BufferWithExtendableBuffer::extendBuffer(const size_t size) { const size_t extendSize = std::max(EXTEND_ADDITIONAL_BUFFER_SIZE_STEP, size); - const size_t sizeAfterExtending = mAdditionalBuffer.size() + extendSize; - if (sizeAfterExtending > mMaxAdditionalBufferSize) { + const size_t sizeAfterExtending = + std::min(mAdditionalBuffer.size() + extendSize, mMaxAdditionalBufferSize); + if (sizeAfterExtending < mAdditionalBuffer.size() + size) { return false; } mAdditionalBuffer.resize(sizeAfterExtending); |