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

AP_HAL_Linux: fixed _parseDevicePath() in LinuxUARTDRiver 

The current implementation doesn't throw an error on a malformed path string.

i.e. udp:192.168.1.1.14550 instead of udp:192.168.1.1:14550 may result in a memory leak or whatsoever.

The commit fixes the issue and outputs a nice error message if anything's wrong.
This commit is contained in:
Staroselskii Georgii 2015-07-16 20:05:55 +03:00 committed by Andrew Tridgell
parent 0362128265
commit aa3efecef3
1 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libraries/AP_HAL_Linux/UARTDriver.cpp
View File

@ -97,7 +97,8 @@ void LinuxUARTDriver::begin(uint32_t b, uint16_t rxS, uint16_t txS)
default: default:
{ {
// Notify that the option is not valid and select standart input and output // Notify that the option is not valid and select standart input and output
::printf("LinuxUARTDriver parsing failed, using default\n"); ::printf("Argument is not valid. Fallback to console.\n");
::printf("Launch with --help to see an example.\n");
_device = new ConsoleDevice(); _device = new ConsoleDevice();
_device->open(); _device->open();
@ -188,49 +189,66 @@ void LinuxUARTDriver::_deallocate_buffers()
LinuxUARTDriver::device_type LinuxUARTDriver::_parseDevicePath(const char *arg) LinuxUARTDriver::device_type LinuxUARTDriver::_parseDevicePath(const char *arg)
{ {
struct stat st; struct stat st;
_flag = NULL; // init flag
if (stat(arg, &st) == 0 && S_ISCHR(st.st_mode)) {
return DEVICE_SERIAL;
} else if (strncmp(arg, "tcp:", 4) != 0 &&
strncmp(arg, "udp:", 4) != 0) {
return DEVICE_UNKNOWN;
}
char *devstr = strdup(arg); char *devstr = strdup(arg);
if (devstr == NULL) { if (devstr == NULL) {
return DEVICE_UNKNOWN; return DEVICE_UNKNOWN;
} }
if (stat(devstr, &st) == 0 && S_ISCHR(st.st_mode)) { char *saveptr = NULL;
free(devstr); char *protocol, *ip, *port, *flag;
return DEVICE_SERIAL;
} else if (strncmp(devstr, "tcp:", 4) == 0 || protocol = strtok_r(devstr, ":", &saveptr);
strncmp(devstr, "udp:", 4) == 0) { ip = strtok_r(NULL, ":", &saveptr);
char *saveptr = NULL; port = strtok_r(NULL, ":", &saveptr);
// Parse the string flag = strtok_r(NULL, ":", &saveptr);
char *protocol, *ip, *port, *flag;
protocol = strtok_r(devstr, ":", &saveptr); device_type type = DEVICE_UNKNOWN;
ip = strtok_r(NULL, ":", &saveptr);
port = strtok_r(NULL, ":", &saveptr); if (ip == NULL || port == NULL) {
flag = strtok_r(NULL, ":", &saveptr); fprintf(stderr, "IP or port is set incorrectly.\n");
type = DEVICE_UNKNOWN;
_base_port = (uint16_t) atoi(port); goto errout;
if (_ip) free(_ip);
_ip = NULL;
if (ip) {
_ip = strdup(ip);
}
if (_flag) free(_flag);
_flag = NULL;
if (flag) {
_flag = strdup(flag);
}
if (strcmp(protocol, "udp") == 0) {
free(devstr);
return DEVICE_UDP;
}
free(devstr);
return DEVICE_TCP;
} }
if (_ip) {
free(_ip);
_ip = NULL;
}
if (_flag) {
free(_flag);
_flag = NULL;
}
_base_port = (uint16_t) atoi(port);
_ip = strdup(ip);
/* Optional flag for TCP */
if (flag != NULL) {
_flag = strdup(flag);
}
if (strcmp(protocol, "udp") == 0) {
type = DEVICE_UDP;
} else {
type = DEVICE_TCP;
}
errout:
free(devstr); free(devstr);
return DEVICE_UNKNOWN; return type;
} }
bool LinuxUARTDriver::_serial_start_connection() bool LinuxUARTDriver::_serial_start_connection()
{ {
_device = new UARTDevice(device_path); _device = new UARTDevice(device_path);