projects_leo/ttgo_smartwatch_prox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some possible buffer overflows

Browse Source
This commit is contained in:
sharandac
2020-08-21 10:25:00 +02:00
parent 8b4efadb2a
commit 183b2c3532
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/weather/weather_fetch.cpp
View File

@@ -117,8 +117,8 @@ int weather_fetch_forecast( weather_config_t *weather_config, weather_forcast_t
snprintf( weather_forecast[ i ].temp, sizeof( weather_forecast[ i ].temp ),"%0.1f°%s", doc["list"][i]["main"]["temp"].as<float>(), weather_units_symbol ); snprintf( weather_forecast[ i ].temp, sizeof( weather_forecast[ i ].temp ),"%0.1f°%s", doc["list"][i]["main"]["temp"].as<float>(), weather_units_symbol );
snprintf( weather_forecast[ i ].humidity, sizeof( weather_forecast[ i ].humidity ),"%f%%", doc["list"][i]["main"]["humidity"].as<float>() ); snprintf( weather_forecast[ i ].humidity, sizeof( weather_forecast[ i ].humidity ),"%f%%", doc["list"][i]["main"]["humidity"].as<float>() );
snprintf( weather_forecast[ i ].pressure, sizeof( weather_forecast[ i ].pressure ),"%fpha", doc["list"][i]["main"]["pressure"].as<float>() ); snprintf( weather_forecast[ i ].pressure, sizeof( weather_forecast[ i ].pressure ),"%fpha", doc["list"][i]["main"]["pressure"].as<float>() );
strcpy( weather_forecast[ i ].icon, doc["list"][i]["weather"][0]["icon"] ); strlcpy( weather_forecast[ i ].icon, doc["list"][i]["weather"][0]["icon"], sizeof( weather_forecast[ i ].icon ) );
strcpy( weather_forecast[ i ].name, doc["city"]["name"] ); strlcpy( weather_forecast[ i ].name, doc["city"]["name"], sizeof( weather_forecast[ i ].name ) );
int directionDegree = doc["list"][i]["wind"]["deg"].as<int>(); int directionDegree = doc["list"][i]["wind"]["deg"].as<int>();
int speed = doc["list"][i]["wind"]["speed"].as<int>(); int speed = doc["list"][i]["wind"]["speed"].as<int>();

12
src/app/weather/weather_setup.cpp
View File

@@ -250,9 +250,9 @@ static void exit_weather_widget_setup_event_cb( lv_obj_t * obj, lv_event_t event
switch( event ) { switch( event ) {
case( LV_EVENT_CLICKED ): keyboard_hide(); case( LV_EVENT_CLICKED ): keyboard_hide();
weather_config_t *weather_config = weather_get_config(); weather_config_t *weather_config = weather_get_config();
strcpy( weather_config->apikey, lv_textarea_get_text( weather_apikey_textfield ) ); strlcpy( weather_config->apikey, lv_textarea_get_text( weather_apikey_textfield ), sizeof( weather_config->apikey ) );
strcpy( weather_config->lat, lv_textarea_get_text( weather_lat_textfield ) ); strlcpy( weather_config->lat, lv_textarea_get_text( weather_lat_textfield ), sizeof( weather_config->lat ) );
strcpy( weather_config->lon, lv_textarea_get_text( weather_lon_textfield ) ); strlcpy( weather_config->lon, lv_textarea_get_text( weather_lon_textfield ), sizeof( weather_config->lon ) );
weather_save_config(); weather_save_config();
weather_jump_to_forecast(); weather_jump_to_forecast();
break; break;
@@ -280,9 +280,9 @@ void bluetooth_message_msg_pharse( char* msg ) {
if ( !strcmp( doc["app"], "weather" ) ) { if ( !strcmp( doc["app"], "weather" ) ) {
weather_config_t *weather_config = weather_get_config(); weather_config_t *weather_config = weather_get_config();
strcpy( weather_config->apikey, doc["apikey"] ); strlcpy( weather_config->apikey, doc["apikey"], sizeof( weather_config->apikey ) );
strcpy( weather_config->lat, doc["lat"] ); strlcpy( weather_config->lat, doc["lat"], sizeof( weather_config->lat ) );
strcpy( weather_config->lon, doc["lon"] ); strlcpy( weather_config->lon, doc["lon"], sizeof( weather_config->lon ) );
weather_save_config(); weather_save_config();
motor_vibe(100); motor_vibe(100);
} }

2
src/config.h
View File

@@ -32,6 +32,6 @@
/* /*
* firmeware version string * firmeware version string
*/ */
#define __FIRMWARE__ "2020082103" #define __FIRMWARE__ "2020082104"
#endif // _CONFIG_H #endif // _CONFIG_H

4
src/gui/mainbar/setup_tile/update/update_check_version.cpp
View File

@@ -74,7 +74,7 @@ int64_t update_check_new_version( char *url ) {
} }
firmwarehost = tmp_firmwarehost; firmwarehost = tmp_firmwarehost;
} }
strcpy( firmwarehost, doc["host"] ); strlcpy( firmwarehost, doc["host"], sizeof( firmwarehost ) );
log_i("firmwarehost: %s", firmwarehost ); log_i("firmwarehost: %s", firmwarehost );
} }
@@ -94,7 +94,7 @@ int64_t update_check_new_version( char *url ) {
} }
firmwarefile = tmp_firmwarefile; firmwarefile = tmp_firmwarefile;
} }
strcpy( firmwarefile, doc["file"] ); strlcpy( firmwarefile, doc["file"], sizeof( firmwarefile ) );
log_i("firmwarefile: %s", firmwarefile ); log_i("firmwarefile: %s", firmwarefile );
} }

14
src/hardware/wifictl.cpp
View File

@@ -410,7 +410,7 @@ bool wifictl_insert_network( const char *ssid, const char *password ) {
// check if existin // check if existin
for( int entry = 0 ; entry < NETWORKLIST_ENTRYS; entry++ ) { for( int entry = 0 ; entry < NETWORKLIST_ENTRYS; entry++ ) {
if( !strcmp( ssid, wifictl_networklist[ entry ].ssid ) ) { if( !strcmp( ssid, wifictl_networklist[ entry ].ssid ) ) {
strncpy( wifictl_networklist[ entry ].password, password, sizeof( wifictl_networklist[ entry ].password ) ); strlcpy( wifictl_networklist[ entry ].password, password, sizeof( wifictl_networklist[ entry ].password ) );
wifictl_save_config(); wifictl_save_config();
WiFi.scanNetworks(); WiFi.scanNetworks();
wifictl_set_event( WIFICTL_SCAN ); wifictl_set_event( WIFICTL_SCAN );
@@ -420,8 +420,8 @@ bool wifictl_insert_network( const char *ssid, const char *password ) {
// check for an emty entry // check for an emty entry
for( int entry = 0 ; entry < NETWORKLIST_ENTRYS; entry++ ) { for( int entry = 0 ; entry < NETWORKLIST_ENTRYS; entry++ ) {
if( strlen( wifictl_networklist[ entry ].ssid ) == 0 ) { if( strlen( wifictl_networklist[ entry ].ssid ) == 0 ) {
strncpy( wifictl_networklist[ entry ].ssid, ssid, sizeof( wifictl_networklist[ entry ].ssid ) ); strlcpy( wifictl_networklist[ entry ].ssid, ssid, sizeof( wifictl_networklist[ entry ].ssid ) );
strncpy( wifictl_networklist[ entry ].password, password, sizeof( wifictl_networklist[ entry ].password ) ); strlcpy( wifictl_networklist[ entry ].password, password, sizeof( wifictl_networklist[ entry ].password ) );
wifictl_save_config(); wifictl_save_config();
WiFi.scanNetworks(); WiFi.scanNetworks();
wifictl_set_event( WIFICTL_SCAN ); wifictl_set_event( WIFICTL_SCAN );
@@ -486,10 +486,10 @@ void wifictl_start_wps( void ) {
esp_wps_config.crypto_funcs = &g_wifi_default_wps_crypto_funcs; esp_wps_config.crypto_funcs = &g_wifi_default_wps_crypto_funcs;
esp_wps_config.wps_type = ESP_WPS_MODE; esp_wps_config.wps_type = ESP_WPS_MODE;
strcpy(esp_wps_config.factory_info.manufacturer, ESP_MANUFACTURER); strlcpy( esp_wps_config.factory_info.manufacturer, ESP_MANUFACTURER, sizeof( esp_wps_config.factory_info.manufacturer ) );
strcpy(esp_wps_config.factory_info.model_number, ESP_MODEL_NUMBER); strlcpy( esp_wps_config.factory_info.model_number, ESP_MODEL_NUMBER, sizeof( esp_wps_config.factory_info.model_number ) );
strcpy(esp_wps_config.factory_info.model_name, ESP_MODEL_NAME); strlcpy( esp_wps_config.factory_info.model_name, ESP_MODEL_NAME, sizeof( esp_wps_config.factory_info.model_name ) );
strcpy(esp_wps_config.factory_info.device_name, ESP_DEVICE_NAME); strlcpy( esp_wps_config.factory_info.device_name, ESP_DEVICE_NAME, sizeof( esp_wps_config.factory_info.device_name ) );
WiFi.mode( WIFI_OFF ); WiFi.mode( WIFI_OFF );
esp_wifi_stop(); esp_wifi_stop();

BIN
ttgo-t-watch2020_v1.ino.bin
View File

Binary file not shown.

2
ttgo-t-watch2020_v1.version.json
View File

@@ -1 +1 @@
{"version":"2020082103","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"} {"version":"2020082104","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}