terapines
/
circt
mirror of https://github.com/llvm/circt.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIRRTL][GrandCentral] Fix crashes on error re:tryGetAs. (#7576) 

Check return values of parsing functions.

Found via fuzzing.
This commit is contained in:
Will Dietz 2024-09-03 15:34:35 -05:00 committed by GitHub
parent c102ea8832
commit 546575da37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Dialect/FIRRTL/Transforms/GrandCentral.cpp
View File

@ -876,6 +876,8 @@ parseAugmentedType(ApplyState &state, DictionaryAttr augmentedType,
auto refAttr =
tryGetAs<StringAttr>(refTarget, refTarget, "ref", loc, clazz, path);
if (!refAttr)
return {};
return (Twine("~" + circuitAttr.getValue() + "|" + moduleAttr.getValue() +
strpath + ">" + refAttr.getValue()) +
@ -932,13 +934,15 @@ parseAugmentedType(ApplyState &state, DictionaryAttr augmentedType,
auto name = tryGetAs<StringAttr>(field, root, "name", loc, clazz, ePath);
auto tpe =
tryGetAs<DictionaryAttr>(field, root, "tpe", loc, clazz, ePath);
if (!name || !tpe)
return std::nullopt;
std::optional<StringAttr> description;
if (auto maybeDescription = field.get("description"))
description = cast<StringAttr>(maybeDescription);
auto eltAttr = parseAugmentedType(
state, tpe, root, companion, name, defName, std::nullopt, description,
clazz, companionAttr, path + "_" + name.getValue());
if (!name || !tpe || !eltAttr)
if (!eltAttr)
return std::nullopt;
// Collect information necessary to build a module with this view later.