]> granicus.if.org Git - esp-idf/commitdiff
examples: Fix build errors that weren't being caught by CI
authorAngus Gratton <angus@espressif.com>
Fri, 30 Dec 2016 05:12:48 +0000 (16:12 +1100)
committerAngus Gratton <angus@espressif.com>
Fri, 30 Dec 2016 05:53:01 +0000 (16:53 +1100)
examples/12_blufi/components/blufi/blufi.c
examples/12_blufi/main/demo_main.c
examples/17_ethernet/main/tlk110_phy.h [moved from examples/14_ethernet/main/tlk110_phy.h with 100% similarity]

index 5a1c543b50c055c0311d360f2ceab723ff62b25d..ce473667a47080ddcf20335ba95caf5c4d6a3f51 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "bt_trace.h"
 #include "bt_types.h"
+#include "bta_api.h"
 
 #include "blufi.h"
 
index f1c38077410736d5aaf62208a7470f48e9b8b477..90992313c22dd5b84864b5a57dac0b2a0c5a9f96 100644 (file)
@@ -46,15 +46,15 @@ const int CONNECTED_BIT = BIT0;
 static wifi_config_t sta_config;
 
 static char tmp_ssid[33];
-static char tmp_passwd[33];
+static char tmp_passwd[65];
 static bool confirm = false;
 
 void wifi_set_blue_config(char *ssid, char *passwd)
 {
-    memset(tmp_ssid, 0, 33);
-    memset(tmp_passwd, 0, 33);
-    strcpy(tmp_ssid, ssid);
-    strcpy(tmp_passwd, passwd);
+    memset(tmp_ssid, 0, sizeof(tmp_ssid));
+    memset(tmp_passwd, 0, sizeof(tmp_passwd));
+    strlcpy(tmp_ssid, ssid, sizeof(tmp_ssid));
+    strlcpy(tmp_passwd, passwd, sizeof(tmp_passwd));
     confirm = true;
     LOG_DEBUG("confirm true\n");
 }
@@ -105,8 +105,8 @@ void wifiTestTask(void *pvParameters)
         if (confirm) {
             confirm = false;
 
-            strcpy(sta_config.sta.ssid, tmp_ssid);
-            strcpy(sta_config.sta.password, tmp_passwd);
+            memcpy(sta_config.sta.ssid, tmp_ssid, sizeof(sta_config.sta.ssid));
+            memcpy(sta_config.sta.password, tmp_passwd, sizeof(sta_config.sta.password));
             sta_config.sta.bssid_set = 0;
 
             ret = esp_wifi_disconnect();