valgrind didn't like accesses to si->si_connaddr Also fix an array bounds check in ITS#9282 merge_state