Skip to content

Commit f6d6fd3

Browse files
mircomircary-ilm
andcommitted
Fix Null-dereference READ (#2382)
Signed-off-by: Mirco Miranda <mirco.miranda@systemceramics.com> Co-authored-by: Cary Phillips <cary@ilm.com>
1 parent e56ec07 commit f6d6fd3

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

src/lib/OpenEXR/ImfRgbaFile.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ prefixFromLayerName (const string& layerName, const Header& header)
9090
{
9191
if (layerName.empty ()) return "";
9292

93-
if (hasMultiView (header) && multiView (header)[0] == layerName) return "";
93+
if (hasMultiView (header))
94+
{
95+
StringVector sv = multiView (header);
96+
if (!sv.empty() && sv[0] == layerName) return "";
97+
}
9498

9599
return layerName + ".";
96100
}

src/lib/OpenEXR/ImfTiledRgbaFile.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ prefixFromLayerName (const string& layerName, const Header& header)
9494
{
9595
if (layerName.empty ()) return "";
9696

97-
if (hasMultiView (header) && multiView (header)[0] == layerName) return "";
97+
if (hasMultiView (header))
98+
{
99+
StringVector sv = multiView (header);
100+
if (!sv.empty() && sv[0] == layerName) return "";
101+
}
98102

99103
return layerName + ".";
100104
}

0 commit comments

Comments
 (0)