AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed DSLParser assertion error uncovered by fuzzer

Browse Source 
Bug: oss-fuzz:38108
Change-Id: I0e055d837923f00b982bc395dbf29b6ff59a3b21
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/448896
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Ethan Nicholas 2021-09-17 16:10:29 -04:00 committed by SkCQ
parent 64be3c5867
commit c973d26854
9 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/sksl_tests.gni
View File

@ -104,6 +104,7 @@ sksl_error_tests = [
"/sksl/errors/Ossfuzz37620.sksl", "/sksl/errors/Ossfuzz37620.sksl",
"/sksl/errors/Ossfuzz38106.sksl", "/sksl/errors/Ossfuzz38106.sksl",
"/sksl/errors/Ossfuzz38107.sksl", "/sksl/errors/Ossfuzz38107.sksl",
"/sksl/errors/Ossfuzz38108.sksl",
"/sksl/errors/Ossfuzz38140.sksl", "/sksl/errors/Ossfuzz38140.sksl",
"/sksl/errors/Ossfuzz38560.sksl", "/sksl/errors/Ossfuzz38560.sksl",
"/sksl/errors/Ossfuzz38865.sksl", "/sksl/errors/Ossfuzz38865.sksl",

2
include/sksl/DSLSymbols.h
View File

@ -57,7 +57,7 @@ bool IsType(skstd::string_view name);
/** /**
* Adds a variable to the current symbol table. * Adds a variable to the current symbol table.
*/ */
void AddToSymbolTable(DSLVarBase& var); void AddToSymbolTable(DSLVarBase& var, PositionInfo pos = PositionInfo::Capture());
} // namespace dsl } // namespace dsl

4
resources/sksl/errors/DuplicateSymbol.sksl
View File

@ -2,4 +2,6 @@ int x;
int x; int x;
int main; int main;
void main() {} void main() {
int y,y;
}

1
resources/sksl/errors/Ossfuzz38108.sksl Normal file
View File

@ -0,0 +1 @@
int a,a;

2
src/sksl/SkSLCompiler.cpp
View File

@ -884,6 +884,7 @@ bool Compiler::toSPIRV(Program& program, OutputStream& out) {
errors.append(disassembly); errors.append(disassembly);
} }
this->errorReporter().error(-1, errors); this->errorReporter().error(-1, errors);
this->errorReporter().reportPendingErrors(PositionInfo());
#else #else
SkDEBUGFAILF("%s", errors.c_str()); SkDEBUGFAILF("%s", errors.c_str());
#endif #endif
@ -957,7 +958,6 @@ void Compiler::handleError(skstd::string_view msg, PositionInfo pos) {
} }
String Compiler::errorText(bool showCount) { String Compiler::errorText(bool showCount) {
this->errorReporter().reportPendingErrors(PositionInfo());
if (showCount) { if (showCount) {
this->writeErrorCount(); this->writeErrorCount();
} }

4
src/sksl/SkSLDSLParser.cpp
View File

@ -450,7 +450,7 @@ void DSLParser::globalVarDeclarationEnd(PositionInfo pos, const dsl::DSLModifier
} }
DSLGlobalVar next(mods, type, this->text(identifierName), std::move(anotherInitializer)); DSLGlobalVar next(mods, type, this->text(identifierName), std::move(anotherInitializer));
Declare(next); Declare(next);
AddToSymbolTable(next); AddToSymbolTable(next, this->position(identifierName));
} }
this->expect(Token::Kind::TK_SEMICOLON, "';'"); this->expect(Token::Kind::TK_SEMICOLON, "';'");
} }
@ -486,7 +486,7 @@ DSLStatement DSLParser::localVarDeclarationEnd(PositionInfo pos, const dsl::DSLM
} }
DSLVar next(mods, type, this->text(identifierName), std::move(anotherInitializer)); DSLVar next(mods, type, this->text(identifierName), std::move(anotherInitializer));
DSLWriter::AddVarDeclaration(result, next); DSLWriter::AddVarDeclaration(result, next);
AddToSymbolTable(next); AddToSymbolTable(next, this->position(identifierName));
} }
this->expect(Token::Kind::TK_SEMICOLON, "';'"); this->expect(Token::Kind::TK_SEMICOLON, "';'");
return result; return result;

3
src/sksl/dsl/DSLSymbols.cpp
View File

@ -35,11 +35,12 @@ bool IsType(skstd::string_view name) {
return s && s->is<Type>(); return s && s->is<Type>();
} }
void AddToSymbolTable(DSLVarBase& var) { void AddToSymbolTable(DSLVarBase& var, PositionInfo pos) {
const SkSL::Variable* skslVar = DSLWriter::Var(var); const SkSL::Variable* skslVar = DSLWriter::Var(var);
if (skslVar) { if (skslVar) {
CurrentSymbolTable()->addWithoutOwnership(skslVar); CurrentSymbolTable()->addWithoutOwnership(skslVar);
} }
DSLWriter::ReportErrors(pos);
} }
const String* Retain(String string) { const String* Retain(String string) {

3
tests/sksl/errors/DuplicateSymbol.glsl
View File

@ -2,4 +2,5 @@
error: 2: symbol 'x' was already defined error: 2: symbol 'x' was already defined
error: 5: symbol 'main' was already defined error: 5: symbol 'main' was already defined
2 errors error: 6: symbol 'y' was already defined
3 errors

4
tests/sksl/errors/Ossfuzz38108.glsl Normal file
View File

@ -0,0 +1,4 @@
### Compilation failed:
error: 1: symbol 'a' was already defined
1 error