Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-06-08 03:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shaderc infinite loop on varying.def missing ';' + handle line comments. (#3727)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-06-05 22:29:00 -07:00
committed by GitHub
parent 6e0d61bf30
commit 69615a9a51
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tools/shaderc/shaderc.cpp
View File

@@ -1510,13 +1510,38 @@ namespace bgfx
while (!parse.isEmpty() ) while (!parse.isEmpty() )
{ {
parse = bx::strLTrimSpace(parse); parse = bx::strLTrimSpace(parse);
bx::StringView eol = bx::strFind(parse, ';'); if (parse.isEmpty() )
if (eol.isEmpty() )
{ {
eol = bx::strFindEol(parse); break;
}
bx::StringView nl = bx::strFindNl(parse);
bx::StringView line(parse.getPtr(), nl.getPtr() );
const bx::StringView comment = bx::strFind(line, "//");
const bx::StringView code = comment.isEmpty()
? line
: bx::StringView(line.getPtr(), comment.getPtr() )
;
const bx::StringView trimmed = bx::strTrimSpace(code);
if (trimmed.isEmpty() )
{
parse = bx::StringView(nl.getPtr(), term.getTerm() );
continue;
}
bx::StringView eol = bx::strFind(code, ';');
if (eol.isEmpty() )
{
bx::write(_messageWriter, &messageErr
, "Error: Varying definition '%S' is missing a terminating ';'.\n"
, &trimmed
);
return false;
} }
if (!eol.isEmpty() )
{ {
eol.set(eol.getPtr() + 1, parse.getTerm() ); eol.set(eol.getPtr() + 1, parse.getTerm() );
@@ -1587,7 +1612,7 @@ namespace bgfx
varyingMap.insert(std::make_pair(var.m_name, var) ); varyingMap.insert(std::make_pair(var.m_name, var) );
} }
parse = bx::strLTrimSpace(bx::strFindNl(bx::StringView(eol.getPtr(), term.getTerm() ) ) ); parse = bx::StringView(nl.getPtr(), term.getTerm() );
} }
} }