mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defensively check for overflow in the number of bitmap channels.

metadata
Edgar Velazquez-Armendariz 2014-02-16 15:26:44 -05:00
parent 7f8bc8c6d6
commit 5c9031cfb6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/bitmap.cpp
View File

@ -1401,7 +1401,9 @@ ref<Bitmap> Bitmap::convertMultiSpectrumAlphaWeight(const std::vector<EPixelForm
EComponentFormat componentFormat, const std::vector<std::string> &channelNames) const {
if (m_componentFormat != EFloat && m_pixelFormat != EMultiSpectrumAlphaWeight)
Log(EError, "convertMultiSpectrumAlphaWeight(): unsupported!");
ref<Bitmap> bitmap = new Bitmap(Bitmap::EMultiChannel, Bitmap::EFloat, m_size, channelNames.size());
if (channelNames.size() > std::numeric_limits<uint8_t>::max())
Log(EError, "convertMultiSpectrumAlphaWeight(): excessive number of channels!");
ref<Bitmap> bitmap = new Bitmap(Bitmap::EMultiChannel, Bitmap::EFloat, m_size, (uint8_t) channelNames.size());
bitmap->setChannelNames(channelNames);
for (int y = 0; y<m_size.y; ++y) {