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

am 97a553ae: Fix wrong dereference reading code. 

* commit '97a553ae69cf738b863d6aa64b627a8257b9e5ac':
  Fix wrong dereference reading code.
main
Jean Chalard 2013-12-17 00:22:32 -08:00 committed by Android Git Automerger
parent 70def46778 97a553ae69
commit c0174db8f9
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
java/src/com/android/inputmethod/latin/makedict/SparseTableContentReader.java
View File

@ -58,17 +58,17 @@ public class SparseTableContentReader {
* @param blockSize the block size of the content table. * @param blockSize the block size of the content table.
* @param baseDir the directory which contains the files of the content table. * @param baseDir the directory which contains the files of the content table.
* @param contentFilenames the file names of content files. * @param contentFilenames the file names of content files.
* @param contentIds the ids of contents. These ids are used for a suffix of a name of * @param contentSuffixes the ids of contents. These ids are used for a suffix of a name of
* address files and content files. * address files and content files.
* @param factory the DictionaryBufferFactory which is used for opening the files. * @param factory the DictionaryBufferFactory which is used for opening the files.
*/ */
public SparseTableContentReader(final String name, final int blockSize, final File baseDir, public SparseTableContentReader(final String name, final int blockSize, final File baseDir,
final String[] contentFilenames, final String[] contentIds, final String[] contentFilenames, final String[] contentSuffixes,
final DictionaryBufferFactory factory) { final DictionaryBufferFactory factory) {
if (contentFilenames.length != contentIds.length) { if (contentFilenames.length != contentSuffixes.length) {
throw new RuntimeException("The length of contentFilenames and the length of" throw new RuntimeException("The length of contentFilenames and the length of"
+ " contentIds are different " + contentFilenames.length + ", " + " contentSuffixes are different " + contentFilenames.length + ", "
+ contentIds.length); + contentSuffixes.length);
} }
mBlockSize = blockSize; mBlockSize = blockSize;
mBaseDir = baseDir; mBaseDir = baseDir;
@ -79,8 +79,8 @@ public class SparseTableContentReader {
mContentFiles = new File[mContentCount]; mContentFiles = new File[mContentCount];
for (int i = 0; i < mContentCount; ++i) { for (int i = 0; i < mContentCount; ++i) {
mAddressTableFiles[i] = new File(mBaseDir, mAddressTableFiles[i] = new File(mBaseDir,
name + FormatSpec.CONTENT_TABLE_FILE_SUFFIX + contentIds[i]); name + FormatSpec.CONTENT_TABLE_FILE_SUFFIX + contentSuffixes[i]);
mContentFiles[i] = new File(mBaseDir, contentFilenames[i] + contentIds[i]); mContentFiles[i] = new File(mBaseDir, contentFilenames[i] + contentSuffixes[i]);
} }
mAddressTableBuffers = new DictBuffer[mContentCount]; mAddressTableBuffers = new DictBuffer[mContentCount];
mContentBuffers = new DictBuffer[mContentCount]; mContentBuffers = new DictBuffer[mContentCount];
@ -94,27 +94,33 @@ public class SparseTableContentReader {
} }
} }
protected void read(final int contentIndex, final int index, /**
* Calls the read() callback of the reader with the appropriate buffer appropriately positioned.
* @param contentNumber the index in the original contentFilenames[] array.
* @param terminalId the terminal ID to read.
* @param reader the reader on which to call the callback.
*/
protected void read(final int contentNumber, final int terminalId,
final SparseTableContentReaderInterface reader) { final SparseTableContentReaderInterface reader) {
if (index < 0 || (index / mBlockSize) * SparseTable.SIZE_OF_INT_IN_BYTES if (terminalId < 0 || (terminalId / mBlockSize) * SparseTable.SIZE_OF_INT_IN_BYTES
>= mLookupTableBuffer.limit()) { >= mLookupTableBuffer.limit()) {
return; return;
} }
mLookupTableBuffer.position((index / mBlockSize) * SparseTable.SIZE_OF_INT_IN_BYTES); mLookupTableBuffer.position((terminalId / mBlockSize) * SparseTable.SIZE_OF_INT_IN_BYTES);
final int posInAddressTable = mLookupTableBuffer.readInt(); final int indexInAddressTable = mLookupTableBuffer.readInt();
if (posInAddressTable == SparseTable.NOT_EXIST) { if (indexInAddressTable == SparseTable.NOT_EXIST) {
return; return;
} }
mAddressTableBuffers[contentIndex].position( mAddressTableBuffers[contentNumber].position(SparseTable.SIZE_OF_INT_IN_BYTES
(posInAddressTable + index % mBlockSize) * SparseTable.SIZE_OF_INT_IN_BYTES); * ((indexInAddressTable * mBlockSize) + (terminalId % mBlockSize)));
final int address = mAddressTableBuffers[contentIndex].readInt(); final int address = mAddressTableBuffers[contentNumber].readInt();
if (address == SparseTable.NOT_EXIST) { if (address == SparseTable.NOT_EXIST) {
return; return;
} }
mContentBuffers[contentIndex].position(address); mContentBuffers[contentNumber].position(address);
reader.read(mContentBuffers[contentIndex]); reader.read(mContentBuffers[contentNumber]);
} }
} }