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

am 214a3b74: Merge "Fix: incompatible PtNode array size reading." 

* commit '214a3b741f0b4e7845e6feb410e8c84611932717':
  Fix: incompatible PtNode array size reading.
main
Keisuke Kuroyanagi 2013-12-16 06:58:39 -08:00 committed by Android Git Automerger
parent 642198ef2d 214a3b741f
commit 84921ea5bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderUtils.java
View File

@ -436,7 +436,7 @@ public final class BinaryDictDecoderUtils {
final FormatOptions options) { final FormatOptions options) {
dictDecoder.setPosition(headerSize); dictDecoder.setPosition(headerSize);
final int count = dictDecoder.readPtNodeCount(); final int count = dictDecoder.readPtNodeCount();
int groupPos = headerSize + BinaryDictIOUtils.getPtNodeCountSize(count); int groupPos = dictDecoder.getPosition();
final StringBuilder builder = new StringBuilder(); final StringBuilder builder = new StringBuilder();
WeightedString result = null; WeightedString result = null;
@ -498,9 +498,9 @@ public final class BinaryDictDecoderUtils {
do { // Scan the linked-list node. do { // Scan the linked-list node.
final int nodeArrayHeadPos = dictDecoder.getPosition(); final int nodeArrayHeadPos = dictDecoder.getPosition();
final int count = dictDecoder.readPtNodeCount(); final int count = dictDecoder.readPtNodeCount();
int groupOffsetPos = nodeArrayHeadPos + BinaryDictIOUtils.getPtNodeCountSize(count); int groupPos = dictDecoder.getPosition();
for (int i = count; i > 0; --i) { // Scan the array of PtNode. for (int i = count; i > 0; --i) { // Scan the array of PtNode.
PtNodeInfo info = dictDecoder.readPtNode(groupOffsetPos, options); PtNodeInfo info = dictDecoder.readPtNode(groupPos, options);
if (BinaryDictIOUtils.isMovedPtNode(info.mFlags, options)) continue; if (BinaryDictIOUtils.isMovedPtNode(info.mFlags, options)) continue;
ArrayList<WeightedString> shortcutTargets = info.mShortcutTargets; ArrayList<WeightedString> shortcutTargets = info.mShortcutTargets;
ArrayList<WeightedString> bigrams = null; ArrayList<WeightedString> bigrams = null;
@ -536,7 +536,7 @@ public final class BinaryDictDecoderUtils {
0 != (info.mFlags & FormatSpec.FLAG_IS_NOT_A_WORD), 0 != (info.mFlags & FormatSpec.FLAG_IS_NOT_A_WORD),
0 != (info.mFlags & FormatSpec.FLAG_IS_BLACKLISTED))); 0 != (info.mFlags & FormatSpec.FLAG_IS_BLACKLISTED)));
} }
groupOffsetPos = info.mEndAddress; groupPos = info.mEndAddress;
} }
// reach the end of the array. // reach the end of the array.

2
java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
View File

@ -87,7 +87,7 @@ public final class BinaryDictIOUtils {
if (p.mNumOfPtNode == Position.NOT_READ_PTNODE_COUNT) { if (p.mNumOfPtNode == Position.NOT_READ_PTNODE_COUNT) {
p.mNumOfPtNode = dictDecoder.readPtNodeCount(); p.mNumOfPtNode = dictDecoder.readPtNodeCount();
p.mAddress += getPtNodeCountSize(p.mNumOfPtNode); p.mAddress = dictDecoder.getPosition();
p.mPosition = 0; p.mPosition = 0;
} }
if (p.mNumOfPtNode == 0) { if (p.mNumOfPtNode == 0) {