Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: add some safety checks to _parse_decimal_100()

This commit is contained in:
Lucas De Marchi 2016-05-19 15:38:11 -03:00
parent 994b2fc966
commit 035937ea7e
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libraries/AP_GPS/AP_GPS_NMEA.cpp
View File

@ -187,32 +187,29 @@ int16_t AP_GPS_NMEA::_from_hex(char a)
int32_t AP_GPS_NMEA::_parse_decimal_100(const char *p) int32_t AP_GPS_NMEA::_parse_decimal_100(const char *p)
{ {
int32_t ret = 100UL * atol(p); char *endptr = nullptr;
int32_t sign = 1; long ret = 100 * strtol(p, &endptr, 10);
int sign = ret < 0 ? -1 : 1;
if (*p == '+') { if (ret >= (long)INT32_MAX) {
++p; return INT32_MAX;
} else if (*p == '-') { }
++p; if (ret <= (long)INT32_MIN) {
sign = -1; return INT32_MIN;
}
if (endptr == nullptr || *endptr != '.') {
return ret;
} }
while (isdigit(*p)) { if (isdigit(endptr[1])) {
++p; ret += sign * 10 * DIGIT_TO_VAL(endptr[1]);
} if (isdigit(endptr[2])) {
ret += sign * DIGIT_TO_VAL(endptr[2]);
if (*p == '.') { if (isdigit(endptr[3])) {
if (isdigit(p[1])) { ret += sign * (DIGIT_TO_VAL(endptr[3]) >= 5);
ret += sign * 10 * DIGIT_TO_VAL(p[1]);
if (isdigit(p[2])) {
ret += sign * DIGIT_TO_VAL(p[2]);
if (isdigit(p[3])) {
ret += sign * (DIGIT_TO_VAL(p[3]) >= 5);
}
} }
} }
} }
return ret; return ret;
} }