Fix crashes in components/policy/resources/PRESUBMIT.py.

components/policy/tools/syntax_check_policy_template_json.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''
 Checks a policy_templates.json file for conformity to its syntax specification.
 '''
 
 import json
@@ skipping 84 matching lines @@
       (if the key is not present):
       Error: |container_name| must have a |value_type| named |key|.
       Offending snippet: |offending| (if specified; defaults to |container|)
       (if the value does not have the required type):
       Error: Value of |key| must be a |value_type|.
       Offending snippet: |container[key]|
 
     Returns: |container[key]| if the key is present, None otherwise.
     '''
     if identifier is None:
-      identifier = container.get('name')
+      try:
+        identifier = container.get('name')
+      except:
+        self._Error('Cannot access container name of "%s".' % container_name)
+        return None
     if container_name is None:
       container_name = parent_element
     if offending == '__CONTAINER__':
       offending = container
     if key not in container:
       if optional:
         return
       else:
         self._Error('%s must have a %s "%s".' %
                     (container_name.title(), value_type.__name__, key),
@@ skipping 313 matching lines @@
       with open(filename, 'w') as f:
         f.writelines(fixed_lines)
 
   def Main(self, filename, options):
     try:
       with open(filename) as f:
         data = eval(f.read())
     except:
       import traceback
       traceback.print_exc(file=sys.stdout)
-      self._Error('Invalid JSON syntax.')
-      return
+      self._Error('Invalid Python/JSON syntax.')
+      return 1
     if data == None:
-      self._Error('Invalid JSON syntax.')
-      return
+      self._Error('Invalid Python/JSON syntax.')
+      return 1
     self.options = options
 
     # First part: check JSON structure.
 
     # Check (non-policy-specific) message definitions.
     messages = self._CheckContains(data, 'messages', dict,
                                    parent_element=None,
                                    container_name='The root element',
                                    offending=None)
     if messages is not None:
@@ skipping 45 matching lines @@
     if filename is None:
       if len(args) != 2:
         parser.print_help()
         sys.exit(1)
       filename = args[1]
     return self.Main(filename, options)
 
 
 if __name__ == '__main__':
   sys.exit(PolicyTemplateChecker().Run(sys.argv))