Fix getChildrenPosition.

Change-Id: Ic39592dbf0d4e6d2e4879cdb1a95b65d46a57e92
main
Yuichiro Hanada 2013-09-18 15:21:30 +09:00
parent 72e53a1e38
commit d0c87576ff
1 changed files with 9 additions and 2 deletions

View File

@ -758,8 +758,15 @@ public class BinaryDictEncoderUtils {
final FormatOptions formatOptions) {
int positionOfChildrenPosField = ptNode.mCachedAddressAfterUpdate
+ getNodeHeaderSize(ptNode, formatOptions);
if (ptNode.mFrequency >= 0) {
positionOfChildrenPosField += FormatSpec.PTNODE_FREQUENCY_SIZE;
if (ptNode.isTerminal()) {
// A terminal node has either the terminal id or the frequency.
// If positionOfChildrenPosField is incorrect, we may crash when jumping to the children
// position.
if (formatOptions.mHasTerminalId) {
positionOfChildrenPosField += FormatSpec.PTNODE_TERMINAL_ID_SIZE;
} else {
positionOfChildrenPosField += FormatSpec.PTNODE_FREQUENCY_SIZE;
}
}
return null == ptNode.mChildren ? FormatSpec.NO_CHILDREN_ADDRESS
: ptNode.mChildren.mCachedAddressAfterUpdate - positionOfChildrenPosField;