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

components/policy/resources/PRESUBMIT.py

 # 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.
 
 # If this presubmit check fails or misbehaves, please complain to
 # mnissler@chromium.org, pastarmovj@chromium.org or joaodasilva@chromium.org.
 
 import itertools
 import sys
 import xml.dom.minidom
 
 def _GetPolicyTemplates(template_path):
   # Read list of policies in the template. eval() is used instead of a JSON
   # parser because policy_templates.json is not quite JSON, and uses some
   # python features such as #-comments and '''strings'''. policy_templates.json
   # is actually maintained as a python dictionary.
   with open(template_path) as f:
     template_data = eval(f.read(), {})
-  policies = ( policy
+  try:
+    policies = ( policy
+                 for policy in template_data['policy_definitions']
+                 if policy['type'] != 'group' )
+    groups = ( policy['policies']
                for policy in template_data['policy_definitions']
-               if policy['type'] != 'group' )
-  groups = ( policy['policies']
-             for policy in template_data['policy_definitions']
-             if policy['type'] == 'group' )
-  subpolicies = ( policy for group in groups for policy in group )
-  return list(itertools.chain(policies, subpolicies))
+               if policy['type'] == 'group' )
+    subpolicies = ( policy for group in groups for policy in group )
+    return list(itertools.chain(policies, subpolicies))
+  except:
+    return list()
 
 def _CheckPolicyTemplatesSyntax(input_api, output_api):
   local_path = input_api.PresubmitLocalPath()
   filepath = input_api.os_path.join(local_path, 'policy_templates.json')
   if any(f.AbsoluteLocalPath() == filepath
          for f in input_api.AffectedFiles()):
     old_sys_path = sys.path
     try:
       tools_path = input_api.os_path.normpath(
           input_api.os_path.join(local_path, input_api.os_path.pardir, 'tools'))
@@ skipping 61 matching lines @@
 
 def _CommonChecks(input_api, output_api):
   results = []
   results.extend(_CheckPolicyTemplatesSyntax(input_api, output_api))
 
   os_path = input_api.os_path
   local_path = input_api.PresubmitLocalPath()
   template_path = os_path.join(local_path, 'policy_templates.json')
   affected_files = input_api.AffectedFiles()
   if any(f.AbsoluteLocalPath() == template_path for f in affected_files):
     policies = _GetPolicyTemplates(template_path)

[Joao da Silva, 2014/04/24 14:34:49]

I suggest you do the try/catch here instead. If _GetPolicyTemplates() throws
then the templates file is malformed and a PresubmitError should be appended to
|results|.

[Thiemo Nagel, 2014/04/24 17:16:24]

Done.

     results.extend(_CheckPolicyTestCases(input_api, output_api, policies))
     results.extend(_CheckPolicyHistograms(input_api, output_api, policies))
 
   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return _CommonChecks(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return _CommonChecks(input_api, output_api)