nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix: ExtendableBuffer"

Browse source
This commit is contained in:
Keisuke Kuroyanagi 2013-09-10 06:45:41 +00:00 committed by Android (Google) Code Review
commit 210669605a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp
View file

@ -66,16 +66,17 @@ bool BufferWithExtendableBuffer::writeCodePointsAndAdvancePosition(const int *co
bool BufferWithExtendableBuffer::checkAndPrepareWriting(const int pos, const int size) { bool BufferWithExtendableBuffer::checkAndPrepareWriting(const int pos, const int size) {
if (isInAdditionalBuffer(pos)) { if (isInAdditionalBuffer(pos)) {
if (pos == mUsedAdditionalBufferSize) { const int tailPosition = getTailPosition();
if (pos == tailPosition) {
// Append data to the tail. // Append data to the tail.
if (pos + size > static_cast<int>(mAdditionalBuffer.size())) { if (pos + size > static_cast<int>(mAdditionalBuffer.size()) + mOriginalBufferSize) {
// Need to extend buffer. // Need to extend buffer.
if (!extendBuffer()) { if (!extendBuffer()) {
return false; return false;
} }
} }
mUsedAdditionalBufferSize += size; mUsedAdditionalBufferSize += size;
} else if (pos + size >= mUsedAdditionalBufferSize) { } else if (pos + size >= tailPosition) {
// The access will beyond the tail of used region. // The access will beyond the tail of used region.
return false; return false;
} }