typos and Complex (curly) syntax fixed

fixed typos.(Secend param of substr function "," by ".") fixed checklist with complex curly syntax. thanks to https://github.com/chinurho to report it.
cfc4n · May 27, 2014 · 9383a4a · 9383a4a
1 parent 16de581
commit 9383a4a
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 28 deletions.
diff --git a/Pecker/Scanner.php b/Pecker/Scanner.php
@@ -13,7 +13,7 @@
  * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
  * @author          CFC4N <cfc4n@cnxct.com>
  * @package         Scanner
- * @version         $Id: Scanner.php 29 2014-03-06 12:55:31Z cfc4n $
+ * @version         $Id: Scanner.php 31 2014-05-27 08:09:52Z cfc4n $
  */
 class Pecker_Scanner
 {
@@ -56,7 +56,7 @@ public function setPath($path)
     {
         if (substr($path,-1) == '/' || substr($path,-1) == '\\')
         {
-            $path = substr($path, 0.-1);
+            $path = substr($path, 0,-1);
         }
         if (!is_dir($path))
         {
@@ -169,9 +169,12 @@ public function ScanCode($code)
     private function checkTokens(array $tokens)
     {
         $i = 0;
+        $curly = false;
+        $curly_str = '';
+        $curly_num = 0;
         foreach ($tokens as $k => $token)
         {
-            if (is_array($token))
+            if (!$curly && is_array($token))
             {
                 switch ($token[0])
                 {
@@ -186,7 +189,6 @@ private function checkTokens(array $tokens)
                         break;
                     case T_VARIABLE:
                         $ntoken = $this->parser->getNextToken($k);
-//                         var_dump($token,$ntoken);exit();
                         $ptoken = $this->parser->getPreToken($k);
                         if ($ntoken === '(' && $ptoken != '->' && $ptoken !== '::' && $ptoken !== 'function' && $ptoken !== 'new')
                         {
@@ -240,6 +242,32 @@ private function checkTokens(array $tokens)
                     default:
                 }
             }
+            elseif ($curly)
+            {
+                //Complex (curly) syntax
+                if (!is_array($token))
+                {
+                    if ($token === '{')
+                    {
+                        $curly_str .= '{';
+                        $curly_num ++;
+                    }
+                    elseif($token === '}')
+                    {
+                        $curly_str .= '}';
+                        $curly_num --;
+                    }
+                }
+                else 
+                {
+                    $curly_str .= $token[1];
+                }
+                if ($curly_num == 0)
+                {
+                    $curly = false;
+                    $this->report->catchLog($curly_str, 0,$this->parser->getPieceTokenAll($k));
+                }
+            }
             elseif($token === '$')
             {
                 /**
@@ -260,15 +288,9 @@ private function checkTokens(array $tokens)
                 $nt = $this->parser->getVariableToken($k);
                 if ($nt['token'] === '{')
                 {
-                    $nt1 = $this->parser->getVariableToken($k+$nt['key']+1);
-                    if ($nt1['token'] === '}' && $this->parser->getNextToken($k+$nt['key']+$nt1['key']+2) === '(')
-                    {
-                        $this->report->catchLog('${'.$nt1['func'].'}', 0,$this->parser->getPieceTokenAll($nt1['key']+$k+1));
-                    }
-                }
-                elseif($nt['token'] === '(')
-                {
-                    $this->report->catchLog('$'.$nt['func'], 0,$this->parser->getPieceTokenAll($nt['key']+$k));
+                    $curly = true;
+                    $curly_str = '$';
+                    $curly_num = 0;
                 }
             }
         }

diff --git a/PeckerLite/PeckerScanner.lite.php b/PeckerLite/PeckerScanner.lite.php
@@ -15,7 +15,7 @@
  * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
  * @author          CFC4N <cfc4n@cnxct.com>
  * @package         Lexer All
- * @version         $Id: PeckerScanner.lite.php 29 2014-03-06 12:55:31Z cfc4n $
+ * @version         $Id: PeckerScanner.lite.php 31 2014-05-27 08:09:52Z cfc4n $
  */
 
 class Pecker_Scanner
@@ -59,7 +59,7 @@ public function setPath($path)
     {
         if (substr($path,-1) == '/' || substr($path,-1) == '\\')
         {
-            $path = substr($path, 0.-1);
+            $path = substr($path, 0,-1);
         }
         if (!is_dir($path))
         {
@@ -172,9 +172,12 @@ public function ScanCode($code)
     private function checkTokens(array $tokens)
     {
         $i = 0;
+        $curly = false;
+        $curly_str = '';
+        $curly_num = 0;
         foreach ($tokens as $k => $token)
         {
-            if (is_array($token))
+            if (!$curly && is_array($token))
             {
                 switch ($token[0])
                 {
@@ -243,6 +246,32 @@ private function checkTokens(array $tokens)
                     default:
                 }
             }
+            elseif ($curly)
+            {
+                //Complex (curly) syntax
+                if (!is_array($token))
+                {
+                    if ($token === '{')
+                    {
+                        $curly_str .= '{';
+                        $curly_num ++;
+                    }
+                    elseif($token === '}')
+                    {
+                        $curly_str .= '}';
+                        $curly_num --;
+                    }
+                }
+                else
+                {
+                    $curly_str .= $token[1];
+                }
+                if ($curly_num == 0)
+                {
+                    $curly = false;
+                    $this->report->catchLog($curly_str, 0,$this->parser->getPieceTokenAll($k));
+                }
+            }
             elseif($token === '$')
             {
                 /**
@@ -263,15 +292,9 @@ private function checkTokens(array $tokens)
                 $nt = $this->parser->getVariableToken($k);
                 if ($nt['token'] === '{')
                 {
-                    $nt1 = $this->parser->getVariableToken($k+$nt['key']+1);
-                    if ($nt1['token'] === '}' && $this->parser->getNextToken($k+$nt['key']+$nt1['key']+2) === '(')
-                    {
-                        $this->report->catchLog('${'.$nt1['func'].'}', 0,$this->parser->getPieceTokenAll($nt1['key']+$k+1));
-                    }
-                }
-                elseif($nt['token'] === '(')
-                {
-                    $this->report->catchLog('$'.$nt['func'], 0,$this->parser->getPieceTokenAll($nt['key']+$k));
+                    $curly = true;
+                    $curly_str = '$';
+                    $curly_num = 0;
                 }
             }
         }

diff --git a/test/1.php b/test/1.php
@@ -13,7 +13,7 @@
  * @license         http://www.fsf.org/copyleft/gpl.html GNU public license
  * @author          CFC4N <cfc4n@cnxct.com>
  * @package         demo
- * @version         $Id: 1.php 29 2014-03-06 12:55:31Z cfc4n $
+ * @version         $Id: 1.php 31 2014-05-27 08:09:52Z cfc4n $
  */
 
 $str = 'base64_decode';
@@ -65,8 +65,9 @@ function exec()                 //pass
 ${2+1}();    //get it
 ${2+1};    //pass
 ${@func};    //pass
-
-
+$evil = '';
+${ $ {func}}($evil);    //get it
+${(array)function(){}}($evil);    //get it
 @preg_replace("/[pageerror]/e",$_POST['error'],"cfc");    //get it
 header('HTTP/1.1 404 Not Found');