am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread

* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.