1 files changed, 2 insertions, 0 deletions
diff --git a/gpsutils.c b/gpsutils.c
index b89ece05..fd978b6c 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -105,6 +105,8 @@ void gps_merge_fix(/*@ out @*/struct gps_fix_t *to,
 		   /*@ in @*/struct gps_fix_t *from)
 /* merge new data into an old fix */
 {
+    if ((NULL == to) || (NULL == from))
+	return;
     if ((transfer & TIME_SET)!=0)
 	to->time = from->time;
     if ((transfer & LATLON_SET)!=0) {