aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cases where malformed program could cause crash.

Browse Source
This commit is contained in:
Matt Pharr
2012-03-05 09:11:42 -08:00
parent 8ef41dfd97
commit 2f958cfbda
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parse.yy
View File

@@ -1811,11 +1811,17 @@ lAddDeclaration(DeclSpecs *ds, Declarator *decl) {
m->AddTypeDef(decl->GetSymbol()); m->AddTypeDef(decl->GetSymbol());
else { else {
const Type *t = decl->GetType(ds); const Type *t = decl->GetType(ds);
if (t == NULL) if (t == NULL) {
Assert(m->errorCount > 0);
return; return;
}
Symbol *sym = decl->GetSymbol(); Symbol *sym = decl->GetSymbol();
Assert(sym != NULL); if (sym == NULL) {
Assert(m->errorCount > 0);
return;
}
const FunctionType *ft = dynamic_cast<const FunctionType *>(t); const FunctionType *ft = dynamic_cast<const FunctionType *>(t);
if (ft != NULL) { if (ft != NULL) {
sym->type = ft; sym->type = ft;
@@ -1850,7 +1856,10 @@ lAddFunctionParams(Declarator *decl) {
// walk down to the declarator for the function itself // walk down to the declarator for the function itself
while (decl->kind != DK_FUNCTION && decl->child != NULL) while (decl->kind != DK_FUNCTION && decl->child != NULL)
decl = decl->child; decl = decl->child;
Assert(decl->kind == DK_FUNCTION); if (decl->kind != DK_FUNCTION) {
Assert(m->errorCount > 0);
return;
}
// now loop over its parameters and add them to the symbol table // now loop over its parameters and add them to the symbol table
for (unsigned int i = 0; i < decl->functionParams.size(); ++i) { for (unsigned int i = 0; i < decl->functionParams.size(); ++i) {