am 33259fdf: Merge "Fix access past end of args array."

* commit '33259fdfcd350793d10f67f2ea7dfc6051a8afa2':
  Fix access past end of args array.