Skip to content

Commit c0529f6

Browse files
Fix ordering of variable setup for CI
1 parent cd71a4a commit c0529f6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cores/esp8266/WString.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ String::~String() {
130130

131131
inline void String::init(void) {
132132
setSSO(false);
133-
ptr.buf = NULL;
134133
setCapacity(0);
135134
setLen(0);
135+
ptr.buf = NULL;
136136
}
137137

138138
void String::invalidate(void) {
@@ -183,13 +183,13 @@ unsigned char String::changeBuffer(unsigned int maxStrLen) {
183183
// Copy the SSO buffer into allocated space
184184
memcpy(newbuffer, sso_buf, sizeof(sso_buf));
185185
}
186-
setSSO(false);
187186
if (newSize > oldSize)
188187
{
189188
memset(newbuffer + oldSize, 0, newSize - oldSize);
190189
}
190+
setSSO(false);
191191
setCapacity(newSize - 1);
192-
setLen(oldLen); // Needed in case of SSO where len() never existed
192+
setLen(oldLen); // Needed in case of SSO where len() never existed
193193
ptr.buf = newbuffer;
194194
return 1;
195195
}
@@ -245,10 +245,10 @@ void String::move(String &rhs) {
245245
}
246246
setCapacity(rhs.capacity());
247247
setLen(rhs.len());
248-
rhs.ptr.buf = nullptr;
249248
rhs.setSSO(false);
250249
rhs.setCapacity(0);
251250
rhs.setLen(0);
251+
rhs.ptr.buf = nullptr;
252252
}
253253
#endif
254254

0 commit comments

Comments
 (0)