Merge branch 'master' into error-str

This commit is contained in:
Lee Thomason
2017-12-29 09:11:27 -08:00
55 changed files with 294 additions and 291 deletions

View File

@@ -2421,7 +2421,7 @@ void XMLPrinter::Write( const char* data, size_t size )
fwrite ( data , sizeof(char), size, _fp);
}
else {
char* p = _buffer.PushArr( size ) - 1; // back up over the null terminator.
char* p = _buffer.PushArr( static_cast<int>(size) ) - 1; // back up over the null terminator.
memcpy( p, data, size );
p[size] = 0;
}