am 3f557f6d: Merge "Fix: appendTwoWords cannot handle MAX_WORD_LENGTH-chars word."

* commit '3f557f6d64c2cc83b0dd75db4488c694032e4ad7':
  Fix: appendTwoWords cannot handle MAX_WORD_LENGTH-chars word.
main
Keisuke Kuroynagi 2013-07-31 01:45:20 -07:00 committed by Android Git Automerger
commit b7fbc96480
1 changed files with 1 additions and 1 deletions

View File

@ -150,7 +150,7 @@ namespace latinime {
} }
actualLength1 = i + 1; actualLength1 = i + 1;
} }
actualLength1 = min(actualLength1, MAX_WORD_LENGTH - actualLength0 - 1); actualLength1 = min(actualLength1, MAX_WORD_LENGTH - actualLength0);
memcpy(&dest[actualLength0], src1, actualLength1 * sizeof(dest[0])); memcpy(&dest[actualLength0], src1, actualLength1 * sizeof(dest[0]));
return actualLength0 + actualLength1; return actualLength0 + actualLength1;
} }