v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix heap-buffer overflow in PLY parser

pull/5312/head^2
Alexandre Avenel 2023-11-04 10:28:19 +01:00 committed by Kim Kulling
parent bfe8745b90
commit e4e2c63e0c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/AssetLib/Ply/PlyParser.cpp
View File

@ -425,7 +425,8 @@ bool PLY::DOM::ParseHeader(IOStreamBuffer<char> &streamBuffer, std::vector<char>
break; break;
} else { } else {
// ignore unknown header elements // ignore unknown header elements
streamBuffer.getNextLine(buffer); if (!streamBuffer.getNextLine(buffer))
return false;
} }
} }

2
include/assimp/IOStreamBuffer.h
View File

@ -287,7 +287,7 @@ static AI_FORCE_INLINE bool isEndOfCache(size_t pos, size_t cacheSize) {
template <class T> template <class T>
AI_FORCE_INLINE bool IOStreamBuffer<T>::getNextLine(std::vector<T> &buffer) { AI_FORCE_INLINE bool IOStreamBuffer<T>::getNextLine(std::vector<T> &buffer) {
buffer.resize(m_cacheSize); buffer.resize(m_cacheSize);
if (isEndOfCache(m_cachePos, m_cacheSize) || 0 == m_filePos) { if (m_cachePos >= m_cacheSize || 0 == m_filePos) {
if (!readNextBlock()) { if (!readNextBlock()) {
return false; return false;
} }