This then also breaks the previous expectation that cur_seg would
always be non-NULL. Change the code to take this into account.