Add error and range checks to parse_range
am: 806f72f9e6  -s ours

* commit '806f72f9e6ec0d15b550b79b0baa92a93fc646e3':
  Add error and range checks to parse_range