aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2013-09-10 15:40:11 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2013-09-10 15:40:11 +0900
commit4e79fb24abfc7a13ea5ffe8fa55fc68d99b8f713 (patch)
tree2e72f4a3a00764693aba546bd220be378d001a54
parentfdcd67ba15351f97c9cd5e284ba72d4a6df30c20 (diff)
downloadlatinime-4e79fb24abfc7a13ea5ffe8fa55fc68d99b8f713.tar.gz
latinime-4e79fb24abfc7a13ea5ffe8fa55fc68d99b8f713.tar.xz
latinime-4e79fb24abfc7a13ea5ffe8fa55fc68d99b8f713.zip
Fix: ExtendableBuffer
Bug: 6669677 Change-Id: I73142fdabac1cbd4128b83c3b26b642b4b4f4da7
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp7
1 files changed, 4 insertions, 3 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 6326754c2..dfdaebd18 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
@@ -66,16 +66,17 @@ bool BufferWithExtendableBuffer::writeCodePointsAndAdvancePosition(const int *co
bool BufferWithExtendableBuffer::checkAndPrepareWriting(const int pos, const int size) {
if (isInAdditionalBuffer(pos)) {
- if (pos == mUsedAdditionalBufferSize) {
+ const int tailPosition = getTailPosition();
+ if (pos == tailPosition) {
// 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.
if (!extendBuffer()) {
return false;
}
}
mUsedAdditionalBufferSize += size;
- } else if (pos + size >= mUsedAdditionalBufferSize) {
+ } else if (pos + size >= tailPosition) {
// The access will beyond the tail of used region.
return false;
}