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

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