xplist: Prevent OOB read in two more cases
1 file changed