Prevent case where validation error can be raised on already-removed …

…node This prevents a validation error from having no source stack
ampproject · Mar 21, 2020 · feababc · feababc
1 parent 905ae4a
commit feababc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php b/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@@ -535,10 +535,9 @@ static function ( $validation_error ) {
  } else {
  // Otherwise, we have a rare condition where multiple tag specs fail for different reasons.
  foreach ( $validation_errors as $validation_error ) {
- $this->remove_invalid_child(
- $node,
- $validation_error
- );
+ if ( true === $this->remove_invalid_child( $node, $validation_error ) ) {
+ break; // Once removed, ignore remaining errors.
+ }
  }
  }
  }

diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -96,11 +96,6 @@ public function get_body_data() {
  'spec_name' => 'noscript enclosure for boilerplate',
  'required_parent_name' => 'head',
  ],
- [
- 'code' => AMP_Tag_And_Attribute_Sanitizer::DISALLOWED_TAG_ANCESTOR,
- 'disallowed_ancestor' => 'noscript',
- 'spec_name' => 'noscript',
- ],
  ],
  ],