am 2758e934: Merge "Fix potential overrun by optimized code."

* commit '2758e9340fd01f73e89d1867ff8662f279a587d6':
  Fix potential overrun by optimized code.