The first change removes  potential double free, the second fix a off
by one error.
Signed-off-by: Chris Mason <chris.mason@oracle.com>