ab09bf616a
Instead of trying to guess whether the second buffer needs to be freed set a flag at the place it is allocated