AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-12-24 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix validator crash (#4418)

Browse Source 
Fixes #4411

* Some GLSL.std.450 validation didn't handle an operand without a type
This commit is contained in:
alan-baker 2021-07-29 12:56:58 -04:00 committed by GitHub
parent 17bf443767
commit 5737dbb068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/val/validate_extensions.cpp
View File

@ -812,7 +812,7 @@ spv_result_t ValidateExtInst(ValidationState_t& _, const Instruction* inst) {
for (uint32_t operand_index = 4; operand_index < num_operands;
++operand_index) {
const uint32_t operand_type = _.GetOperandTypeId(inst, operand_index);
if (!_.IsIntScalarOrVectorType(operand_type)) {
if (!operand_type || !_.IsIntScalarOrVectorType(operand_type)) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< ext_inst_name() << ": "
<< "expected all operands to be int scalars or vectors";

39
test/val/val_ext_inst_test.cpp
View File

@ -3507,6 +3507,19 @@ TEST_P(ValidateGlslStd450SAbsLike, WrongBitWidthOperand) {
"Result Type"));
}
TEST_P(ValidateGlslStd450SAbsLike, TypelessOperand) {
const std::string ext_inst_name = GetParam();
const std::string body =
"%val1 = OpExtInst %s64 %extinst " + ext_inst_name + " %main_entry\n";
CompileSuccessfully(GenerateShaderCode(body));
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("GLSL.std.450 " + ext_inst_name +
": expected all operands to be int scalars or vectors"));
}
INSTANTIATE_TEST_SUITE_P(AllSAbsLike, ValidateGlslStd450SAbsLike,
::testing::ValuesIn(std::vector<std::string>{
"SAbs",
@ -3656,6 +3669,19 @@ TEST_P(ValidateGlslStd450UMinLike, WrongBitWidthOperand2) {
"Result Type"));
}
TEST_P(ValidateGlslStd450UMinLike, TypelessOperand) {
const std::string ext_inst_name = GetParam();
const std::string body = "%val1 = OpExtInst %s64 %extinst " + ext_inst_name +
" %s64_0 %main_entry\n";
CompileSuccessfully(GenerateShaderCode(body));
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("GLSL.std.450 " + ext_inst_name +
": expected all operands to be int scalars or vectors"));
}
INSTANTIATE_TEST_SUITE_P(AllUMinLike, ValidateGlslStd450UMinLike,
::testing::ValuesIn(std::vector<std::string>{
"UMin",
@ -3819,6 +3845,19 @@ TEST_P(ValidateGlslStd450UClampLike, WrongBitWidthOperand3) {
"Result Type"));
}
TEST_P(ValidateGlslStd450UClampLike, TypelessOperand) {
const std::string ext_inst_name = GetParam();
const std::string body = "%val1 = OpExtInst %s64 %extinst " + ext_inst_name +
" %main_entry %s64_0 %s64_0\n";
CompileSuccessfully(GenerateShaderCode(body));
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions());
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("GLSL.std.450 " + ext_inst_name +
": expected all operands to be int scalars or vectors"));
}
INSTANTIATE_TEST_SUITE_P(AllUClampLike, ValidateGlslStd450UClampLike,
::testing::ValuesIn(std::vector<std::string>{
"UClamp",