aboutsummaryrefslogtreecommitdiffstats
path: root/core/divesite.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/divesite.c')
-rw-r--r--core/divesite.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/divesite.c b/core/divesite.c
index 2d7bdbefe..73c198e99 100644
--- a/core/divesite.c
+++ b/core/divesite.c
@@ -275,6 +275,9 @@ static void merge_string(char **a, char **b)
{
char *s1 = *a, *s2 = *b;
+ if (!s2)
+ return;
+
if (same_string(s1, s2))
return;