commit 5a545440766886a1bbd09ed7221bb337705e5d14
author Andreas Huber <andih@google.com> Wed Aug 03 10:44:56 2016 -0700
committer Iliyan Malchev <malchev@google.com> Sat Aug 06 09:02:59 2016 -0700
tree 7a4c1f4b4e557528a5493f22bc5518761719cac2
parent e61e3f7b138a992047a60c4b8c27f1c752ed57ba

Better validation. Check that unions contain no fixup types and structs

contain no references to interfaces (hwBinders).

hidl-gen_y.yy

diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy
index 75a79fd..93988fe 100644
--- a/hidl-gen_y.yy
+++ b/hidl-gen_y.yy
@@ -162,7 +162,9 @@
 
           // Register interface immediately so it can be referenced inside
           // definition.
-          ast->addScopedType($2, iface);
+          if (!ast->addScopedType($2, iface)) {
+              YYERROR;
+          }
 
           ast->enterScope(iface);
       }
@@ -201,7 +203,9 @@
     : TYPEDEF type IDENTIFIER
       {
           TypeDef *def = new TypeDef($2);
-          ast->addScopedType($3, def);
+          if (!ast->addScopedType($3, def)) {
+              YYERROR;
+          }
       }
     ;
 
@@ -264,9 +268,14 @@
       {
           CompoundType *container = static_cast<CompoundType *>(ast->scope());
 
-          container->setFields($4);
+          if (!container->setFields($4)) {
+              YYERROR;
+          }
+
           ast->leaveScope();
-          ast->addScopedType($2, container);
+          if (!ast->addScopedType($2, container)) {
+              YYERROR;
+          }
       }
     ;
 
@@ -280,9 +289,14 @@
       {
           CompoundType *container = static_cast<CompoundType *>(ast->scope());
 
-          container->setFields($4);
+          if (!container->setFields($4)) {
+              YYERROR;
+          }
+
           ast->leaveScope();
-          ast->addScopedType($2, container);
+          if (!ast->addScopedType($2, container)) {
+              YYERROR;
+          }
 
           $$ = new RefType(container);
       }
@@ -324,7 +338,9 @@
     : ENUM IDENTIFIER opt_storage_type '{' enum_values opt_comma '}'
       {
           EnumType *enumType = new EnumType($5, $3);
-          ast->addScopedType($2, enumType);
+          if (!ast->addScopedType($2, enumType)) {
+              YYERROR;
+          }
       }
     ;
 
@@ -332,14 +348,18 @@
     : ENUM '{' enum_values opt_comma '}'
       {
           EnumType *enumType = new EnumType($3);
-          ast->addScopedType(NULL /* localName */, enumType);
+          if (!ast->addScopedType(NULL /* localName */, enumType)) {
+              YYERROR;
+          }
 
           $$ = new RefType(enumType);
       }
     | ENUM IDENTIFIER opt_storage_type '{' enum_values opt_comma '}'
       {
           EnumType *enumType = new EnumType($5, $3);
-          ast->addScopedType($2, enumType);
+          if (!ast->addScopedType($2, enumType)) {
+              YYERROR;
+          }
 
           $$ = new RefType(enumType);
       }