PHP_CodeSniffer_File::getTokensAsString() now detects incorrect lengt…

…h value (request #19313)
squizlabs · Mar 5, 2012 · c946650 · c946650
1 parent 53ec9ec
commit c946650
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CodeSniffer/File.php b/CodeSniffer/File.php
@@ -2435,6 +2435,10 @@ public function getTokensAsString($start, $length)
     {
         $str = '';
         $end = ($start + $length);
+        if ($end > $this->numTokens) {
+            $end = $this->numTokens;
+        }
+
         for ($i = $start; $i < $end; $i++) {
             $str .= $this->_tokens[$i]['content'];
         }

diff --git a/package.xml b/package.xml
@@ -1880,6 +1880,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
       -- Thanks to Sebastian Bergmann for the patch
     - Added PHP_CodeSniffer_Tokens::$bracketTokens to give sniff writers fast access to open and close bracket tokens
     - Fixed an issue in AbstractPatternSniff where EOL tokens were not being correctly checked in some cases
+    - PHP_CodeSniffer_File::getTokensAsString() now detects incorrect length value (request #19313)
     - Fixed bug #19114 : CodeSniffer checks extension even for single file
     - Fixed bug #19171 : Show sniff codes option is ignored by some report types
       -- Thanks to Dominic Scheirlinck for the patch