Merge pull request #564 from BlBana/origin/develop

fixed #551 like function(print,echo,include)
FeeiCN · Sep 7, 2017 · 6bdafa2 · 6bdafa2
2 parents 1bdc6a6 + 39accd6
commit 6bdafa2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/cobra/const.py b/cobra/const.py
@@ -31,7 +31,7 @@
 # eval ($test + $test2);
 # call_function ($exp);
 #
-fpc = '\s*\((.*)(?:\))'
+fpc = '(\s*\((.*)(?:\))|\s*(.*\.)*\$.+)'
 fpc_single = '[f]{fpc}'.format(fpc=fpc)
 fpc_multi = '(?:[f]){fpc}'.format(fpc=fpc)
 

diff --git a/tests/vulnerabilities/v_parser.php → tests/examples/v_parser.php b/tests/vulnerabilities/v_parser.php → tests/examples/v_parser.php
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -16,7 +16,7 @@
 from cobra.config import project_directory
 
 
-target_projects = project_directory + '/tests/vulnerabilities/v_parser.php'
+target_projects = project_directory + '/tests/examples/v_parser.php'
 with open(target_projects, 'r') as fi:
     code_contents = fi.read()
 

diff --git a/tests/vulnerabilities/v.php b/tests/vulnerabilities/v.php
@@ -99,4 +99,3 @@ function curl($url){
 if (!empty($file)){
     unlink($file);
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,4 +99,3 @@ function curl($url){
		if (!empty($file)){
		unlink($file);
		}