Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bkaradzic/bx

Browse Source
This commit is contained in:
Branimir Karadžić
2016-08-01 20:33:30 -07:00
parent cdb12272b3 33018625ab
commit e4acc73f0b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/bx/readerwriter.h
View File

@@ -401,7 +401,7 @@ namespace bx
}
int64_t remainder = m_top-m_pos;
int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) );
int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
m_pos += size;
if (size != _size)
{
@@ -454,7 +454,7 @@ namespace bx
BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors.");
int64_t remainder = m_top-m_pos;
int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) );
int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
memcpy(_data, &m_data[m_pos], size);
m_pos += size;
if (size != _size)
@@ -535,7 +535,7 @@ namespace bx
}
int64_t remainder = m_size-m_pos;
int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) );
int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
memcpy(&m_data[m_pos], _data, size);
m_pos += size;
m_top = int64_max(m_top, m_pos);