subsurface crash when merging .xml files

[Linus Torvalds]

On Wed, Feb 15, 2017 at 4:25 PM, Alessandro Volpi <volpial at gmail.com> wrote:
>
> After a few seconds after the beginning of the file merge operation
> subsurface crashed.

I can recreate this. It crashes in strcmp() with a NULL pointer, because of the

    if (!strcmp(a->dc.model, "planneed dive")) {

thing in merge_dives(). Which has two bugs:

 - it should use "same_string()< which correctly  checks for NULL

 - the string it checks for is obviously spelled wrong anyway.

Let me check if just fixing that one line fixes it.

              Linus