am 273d3549: am 2c9d8de7: Merge "Prevent buffer overflows."

* commit '273d3549198d144331f3e502eeb1215417d72b16':
  Prevent buffer overflows.