diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-07-24 23:59:07 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 23:59:07 +0000 |
| commit | 862fa431df2174f2d45045353cdcf29e508dbd15 (patch) | |
| tree | 24761a47029eb9de551362fee3cecf1c43ba631c /native/jni/src | |
| parent | 917f8002c0eb310da517ec97b235fada60978996 (diff) | |
| parent | 370ffb424f4d03143c7e5d8186206e58e6fb4021 (diff) | |
| download | latinime-862fa431df2174f2d45045353cdcf29e508dbd15.tar.gz latinime-862fa431df2174f2d45045353cdcf29e508dbd15.tar.xz latinime-862fa431df2174f2d45045353cdcf29e508dbd15.zip | |
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
Add BufferWithExtendablebufferTest
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); |