Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 18:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduCopter: fixed memory unsafe member access in GCS_MAVLINK

Browse Source 
* Smokey, this is not 'Nam. this is bowling. there are rules
This commit is contained in:
Pat Hickey 2013-02-02 22:40:41 -08:00
parent 527dcdf3b9
commit d418197898
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduCopter/GCS.h
View File

@ -176,8 +176,7 @@ private:
uint16_t waypoint_send_timeout; // milliseconds
uint16_t waypoint_receive_timeout; // milliseconds
// data stream rates. The code assumes that
// streamRateRawSensors is the first
// data stream rates
AP_Int16 streamRateRawSensors;
AP_Int16 streamRateExtendedStatus;
AP_Int16 streamRateRCChannels;

34
ArduCopter/GCS_Mavlink.pde
View File

@ -937,8 +937,38 @@ GCS_MAVLINK::update(void)
// see if we should send a stream now. Called at 50Hz
bool GCS_MAVLINK::stream_trigger(enum streams stream_num)
{
AP_Int16 *stream_rates = &streamRateRawSensors;
uint8_t rate = (uint8_t)stream_rates[stream_num].get();
uint8_t rate;
switch (stream_num) {
case STREAM_RAW_SENSORS:
rate = streamRateRawSensors.get();
break;
case STREAM_EXTENDED_STATUS:
rate = streamRateExtendedStatus.get();
break;
case STREAM_RC_CHANNELS:
rate = streamRateRCChannels.get();
break;
case STREAM_RAW_CONTROLLER:
rate = streamRateRawController.get();
break;
case STREAM_POSITION:
rate = streamRatePosition.get();
break;
case STREAM_EXTRA1:
rate = streamRateExtra1.get();
break;
case STREAM_EXTRA2:
rate = streamRateExtra2.get();
break;
case STREAM_EXTRA3:
rate = streamRateExtra3.get();
break;
case STREAM_PARAMS:
rate = streamRateParams.get();
break;
default:
rate = 0;
}
if (rate == 0) {
return false;