From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 4 Jul 2010 16:28:57 +0000 (+0000)
Subject: Issue #9128: Fix validation of class decorators in parser module.
X-Git-Tag: v2.6.6rc1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=644bef795b2a87ae41cdb308a526d562d77ff116;p=python

Issue #9128: Fix validation of class decorators in parser module.
---

diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index ca5f43fa9a..85e39c7974 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -156,6 +156,14 @@ class RoundtripLegalSyntaxTestCase(unittest.TestCase):
 
     def test_class_defs(self):
         self.check_suite("class foo():pass")
+        self.check_suite("@class_decorator\n"
+                         "class foo():pass")
+        self.check_suite("@class_decorator(arg)\n"
+                         "class foo():pass")
+        self.check_suite("@decorator1\n"
+                         "@decorator2\n"
+                         "class foo():pass")
+
 
     def test_import_from_statement(self):
         self.check_suite("from sys.path import *")
diff --git a/Misc/NEWS b/Misc/NEWS
index cc5ba32189..f605050c07 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,8 @@ C-API
 Library
 -------
 
+- Issue #9128: Fix validation of class decorators in parser module.
+
 - Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
   module, ensure that the input string length is a multiple of the frame size
 
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 365ec901df..097c450d90 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2679,14 +2679,15 @@ validate_funcdef(node *tree)
 static int
 validate_decorated(node *tree)
 {
-  int nch = NCH(tree);
-  int ok = (validate_ntype(tree, decorated)
-            && (nch == 2)
-            && validate_decorators(RCHILD(tree, -2))
-            && (validate_funcdef(RCHILD(tree, -1))
-                || validate_class(RCHILD(tree, -1)))
-            );
-  return ok;
+    int nch = NCH(tree);
+    int ok = (validate_ntype(tree, decorated)
+              && (nch == 2)
+              && validate_decorators(RCHILD(tree, -2)));
+    if (TYPE(RCHILD(tree, -1)) == funcdef)
+        ok = ok && validate_funcdef(RCHILD(tree, -1));
+    else
+        ok = ok && validate_class(RCHILD(tree, -1));
+    return ok;
 }
 
 static int