The second hunk in this patch isn't right.  In the past,
if tmp was null, it would not pass the if.