Merge pull request #11427 from dmaziec1/esp8266_coverity

0xc0170 · web-flow · commit 9da5c2227af8 · 2019-09-06T13:03:43.000+02:00
ESP8266Interface buffer null-terminated and parameters of scan function in correct order
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.cpp b/components/wifi/esp8266-driver/ESP8266Interface.cpp
@@ -319,7 +319,7 @@ int ESP8266Interface::set_credentials(const char *ssid, const char *pass, nsapi_
     if (ssid_length > 0
             && ssid_length <= ESP8266_SSID_MAX_LENGTH) {
         memset(ap_ssid, 0, sizeof(ap_ssid));
-        strncpy(ap_ssid, ssid, sizeof(ap_ssid));
+        strncpy(ap_ssid, ssid, ESP8266_SSID_MAX_LENGTH);
     } else {
         return NSAPI_ERROR_PARAMETER;
     }
@@ -438,7 +438,7 @@ int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count, scan_mode mode,
     }
 
     return _esp.scan(res, count, (mode == SCANMODE_ACTIVE ? ESP8266::SCANMODE_ACTIVE : ESP8266::SCANMODE_PASSIVE),
-                     t_min, t_max);
+                     t_max, t_min);
 }
 
 bool ESP8266Interface::_get_firmware_ok()

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ int ESP8266Interface::set_credentials(const char ssid, const char pass, nsapi_`
`319`	`319`	`if (ssid_length > 0`
`320`	`320`	`&& ssid_length <= ESP8266_SSID_MAX_LENGTH) {`
`321`	`321`	`memset(ap_ssid, 0, sizeof(ap_ssid));`
`322`		`- strncpy(ap_ssid, ssid, sizeof(ap_ssid));`
	`322`	`+ strncpy(ap_ssid, ssid, ESP8266_SSID_MAX_LENGTH);`
`323`	`323`	`} else {`
`324`	`324`	`return NSAPI_ERROR_PARAMETER;`
`325`	`325`	`}`
`@@ -438,7 +438,7 @@ int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count, scan_mode mode,`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`return _esp.scan(res, count, (mode == SCANMODE_ACTIVE ? ESP8266::SCANMODE_ACTIVE : ESP8266::SCANMODE_PASSIVE),`
`441`		`- t_min, t_max);`
	`441`	`+ t_max, t_min);`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`bool ESP8266Interface::_get_firmware_ok()`