Changeset 83aff9f in subsurface


Ignore:
Timestamp:
Feb 15, 2017, 9:46:15 PM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
93763f31
Parents:
78059d4
git-author:
Linus Torvalds <torvalds@…> (02/15/17 17:04:25)
git-committer:
Dirk Hohndel <dirk@…> (02/15/17 21:46:15)
Message:

Fix crash when merging dives with a missing dive computer model

The test for the dive being a planned dive was completely bogus:

  • it should use "same_string()" which correctly checks for NULL
  • the string it checks for is obviously spelled wrong anyway.

Reported-by: Alessandro Volpi <volpial@…>
Fixes: a031dbbbd ("When merging planned dives keep all cylinders")
Signed-off-by: Linus Torvalds <torvalds@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/dive.c

    r0e7d899 r83aff9f  
    31403140        }
    31413141
    3142         if (!strcmp(a->dc.model, "planneed dive")) {
     3142        if (same_string(a->dc.model, "planned dive")) {
    31433143                struct dive *tmp = a;
    31443144                a = b;
Note: See TracChangeset for help on using the changeset viewer.