From d45c2da81d661232fd92ee91a674fc9bc05b3b41 Mon Sep 17 00:00:00 2001 From: Jan Darowski Date: Mon, 16 Mar 2015 19:48:55 +0100 Subject: [PATCH] Fixed dive_set_geodata_from_picture segfault. Segfault did appear when picture had some gps coordinates but there was no dive site assigned to the dive. Signed-off-by: Jan Darowski Signed-off-by: Dirk Hohndel --- dive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dive.c b/dive.c index afa38e471..ce682bc1f 100644 --- a/dive.c +++ b/dive.c @@ -2951,7 +2951,7 @@ unsigned int dive_get_picture_count(struct dive *d) void dive_set_geodata_from_picture(struct dive *d, struct picture *pic) { struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid); - if (!dive_site_has_gps_location(ds) && (pic->latitude.udeg || pic->longitude.udeg)) { + if (ds && !dive_site_has_gps_location(ds) && (pic->latitude.udeg || pic->longitude.udeg)) { ds->latitude = pic->latitude; ds->longitude = pic->longitude; }