Merged in mindnever/librepilot/LP-545_ubx_null_ptr_dereference_fix (pull request #513)

mindnever · f5soh · commit 07871ca19fb6 · 2018-09-29T09:57:13.000Z
LP-545 ubx null ptr dereference fix

Approved-by: Vladimir Zidar &lt;mr_w@mindnever.org&gt;
Approved-by: Jan NIJS &lt;dr.oblivium@gmail.com&gt;
Approved-by: Philippe Renon &lt;philippe_renon@yahoo.fr&gt;
Approved-by: Lalanne Laurent &lt;f5soh@free.fr&gt;
diff --git a/flight/modules/GPS/ubx_autoconfig.c b/flight/modules/GPS/ubx_autoconfig.c
@@ -243,7 +243,9 @@ void gps_ubx_reset_sensor_type()
         ubxSensorType      = GPSPOSITIONSENSOR_SENSORTYPE_UNKNOWN;
         GPSPositionSensorSensorTypeSet(&ubxSensorType);
         // make the sensor type / autobaud code time out immediately to send the request immediately
-        status->lastStepTimestampRaw += 0x8000000UL;
+        if (status) {
+            status->lastStepTimestampRaw += 0x8000000UL;
+        }
     }
     --mutex;
 }

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,9 @@ void gps_ubx_reset_sensor_type()`
`243`	`243`	`ubxSensorType = GPSPOSITIONSENSOR_SENSORTYPE_UNKNOWN;`
`244`	`244`	`GPSPositionSensorSensorTypeSet(&ubxSensorType);`
`245`	`245`	`// make the sensor type / autobaud code time out immediately to send the request immediately`
`246`		`- status->lastStepTimestampRaw += 0x8000000UL;`
	`246`	`+ if (status) {`
	`247`	`+ status->lastStepTimestampRaw += 0x8000000UL;`
	`248`	`+ }`
`247`	`249`	`}`
`248`	`250`	`--mutex;`
`249`	`251`	`}`