File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -130,9 +130,9 @@ String::~String() {
130
130
131
131
inline void String::init (void ) {
132
132
setSSO (false );
133
- ptr.buf = NULL ;
134
133
setCapacity (0 );
135
134
setLen (0 );
135
+ ptr.buf = NULL ;
136
136
}
137
137
138
138
void String::invalidate (void ) {
@@ -183,13 +183,13 @@ unsigned char String::changeBuffer(unsigned int maxStrLen) {
183
183
// Copy the SSO buffer into allocated space
184
184
memcpy (newbuffer, sso_buf, sizeof (sso_buf));
185
185
}
186
- setSSO (false );
187
186
if (newSize > oldSize)
188
187
{
189
188
memset (newbuffer + oldSize, 0 , newSize - oldSize);
190
189
}
190
+ setSSO (false );
191
191
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
193
193
ptr.buf = newbuffer;
194
194
return 1 ;
195
195
}
@@ -245,10 +245,10 @@ void String::move(String &rhs) {
245
245
}
246
246
setCapacity (rhs.capacity ());
247
247
setLen (rhs.len ());
248
- rhs.ptr .buf = nullptr ;
249
248
rhs.setSSO (false );
250
249
rhs.setCapacity (0 );
251
250
rhs.setLen (0 );
251
+ rhs.ptr .buf = nullptr ;
252
252
}
253
253
#endif
254
254
You can’t perform that action at this time.
0 commit comments