TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

flt: prevent zero-byte allocation

Browse Source
This commit is contained in:
rdb 2019-01-09 22:46:34 +01:00
parent 60a944e783
commit 7d398c9aba
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandatool/src/flt/fltRecordReader.cxx
View File

@ -131,12 +131,13 @@ advance(bool ok_eof) {
// And now read the full record based on the length. // And now read the full record based on the length.
int length = _next_record_length - header_size; int length = _next_record_length - header_size;
char *buffer = new char[length];
if (length > 0) { if (length > 0) {
_in.read(buffer, length); vector_uchar data((size_t)length);
_in.read((char *)&data[0], length);
_datagram = Datagram(std::move(data));
} else {
_datagram = Datagram();
} }
_datagram = Datagram(buffer, length);
delete[] buffer;
if (_in.eof()) { if (_in.eof()) {
_state = S_eof; _state = S_eof;
@ -162,12 +163,12 @@ advance(bool ok_eof) {
_record_length += _next_record_length; _record_length += _next_record_length;
length = _next_record_length - header_size; length = _next_record_length - header_size;
buffer = new char[length];
if (length > 0) { if (length > 0) {
char *buffer = new char[length];
_in.read(buffer, length); _in.read(buffer, length);
_datagram.append_data(buffer, length);
delete[] buffer;
} }
_datagram.append_data(buffer, length);
delete[] buffer;
if (_in.eof()) { if (_in.eof()) {
_state = S_eof; _state = S_eof;