Merge "Fix broken pointer overflow check ns_name_unpack()"