Merge branch 'master' of https://github.com/esp8266/Arduino

Author: Harald Frostel

.gitignore

@@ -2,6 +2,7 @@
 tools/dist/
 tools/xtensa-lx106-elf/
 tools/mkspiffs/
+tools/python/
 package/versions/
 exclude.txt
 tools/sdk/lib/liblwip_src.a

cores/esp8266/StreamString.cpp

@@ -25,10 +25,11 @@
 
 size_t StreamString::write(const uint8_t *data, size_t size) {
     if(size && data) {
-        if(reserve(length() + size + 1)) {
+        const unsigned int newlen = length() + size;
+        if(reserve(newlen + 1)) {
             memcpy((void *) (wbuffer() + len()), (const void *) data, size);
-            setLen(len() + size);
-            *(wbuffer() + len()) = 0x00; // add null for string end
+            setLen(newlen);
+            *(wbuffer() + newlen) = 0x00; // add null for string end
             return size;
         }
     }

libraries/ESP8266mDNS/src/LEAmDNS.cpp

@@ -1060,7 +1060,7 @@ bool MDNSResponder::setHostProbeResultCallback(MDNSResponder::MDNSHostProbeFn p_
 
 bool MDNSResponder::setHostProbeResultCallback(MDNSHostProbeFn1 pfn) {
 	using namespace std::placeholders;
-	return setHostProbeResultCallback(std::bind(pfn, *this, _1, _2));
+	return setHostProbeResultCallback(std::bind(pfn, std::ref(*this), _1, _2));
 }
 
 /*
@@ -1089,7 +1089,7 @@ bool MDNSResponder::setServiceProbeResultCallback(const MDNSResponder::hMDNSServ
 bool MDNSResponder::setServiceProbeResultCallback(const MDNSResponder::hMDNSService p_hService,
                                                   MDNSResponder::MDNSServiceProbeFn1 p_fnCallback) {
 	using namespace std::placeholders;
-	return setServiceProbeResultCallback(p_hService, std::bind(p_fnCallback, *this, _1, _2, _3));
+	return setServiceProbeResultCallback(p_hService, std::bind(p_fnCallback, std::ref(*this), _1, _2, _3));
 }