Fixed ISSUE #3 remove json_encode

fate0 · fate0 · commit 4b1b7e207c6b · 2018-11-17T15:35:45.000+08:00
diff --git a/tests/002.phpt b/tests/002.phpt
@@ -39,5 +39,5 @@ bool(false)
 bool(false)
 bool(true)
 bool(true)
-echo_handler:xmark: "aaaa" 1
+echo_handler:xmark: 'aaaa' 1
 aaaa
diff --git a/tests/base.php b/tests/base.php
@@ -24,36 +24,41 @@ function xcheck_var($var, $recursive=true) {
 }
 
 
+function repr($var) {
+    return addcslashes(var_export($var, true), "\n\r\t");
+}
+
+
 function echo_handler($string) {
     if (is_string($string) && xcheck($string)) {
-        echo "echo_handler:xmark: ".json_encode($string)." ".xcheck($string)."\n";
+        echo "echo_handler:xmark: ".repr($string)." ".xcheck($string)."\n";
     }
 }
 
 function exit_handler($string) {
     if (is_string($string) && xcheck($string)) {
-        echo "exit_handler:xmark: ".json_encode($string)." ".xcheck($string)."\n";
+        echo "exit_handler:xmark: ".repr($string)." ".xcheck($string)."\n";
     }
 }
 
 function init_user_dynamic_call_handler($funcname) {
     if (is_string($funcname)) {
         if (xcheck($funcname)) {
-            echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname)." ".xcheck($funcname)."\n";
+            echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname)." ".xcheck($funcname)."\n";
         }
     } else if (is_array($funcname)) {
         if (xcheck($funcname[0])) {
-            echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname[0])." ".xcheck($funcname[0])."\n";
+            echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname[0])." ".xcheck($funcname[0])."\n";
         }
         if (xcheck($funcname[1])) {
-            echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname[1])." ".xcheck($funcname[1])."\n";
+            echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname[1])." ".xcheck($funcname[1])."\n";
         }
     }
 }
 
 function include_or_eval_handler($param) {
     if (xcheck($param)) {
-        echo "include_or_eval_handler:xmark: ".json_encode($param)." ".xcheck($param)."\n";
+        echo "include_or_eval_handler:xmark: ".repr($param)." ".xcheck($param)."\n";
     }
 }
 
diff --git a/tests/taint-bug61816.phpt b/tests/taint-bug61816.phpt
@@ -23,6 +23,6 @@ var_dump(xcheck($c->foo));
 ?>
 --EXPECT--
 bool(true)
-echo_handler:xmark: "tainted string.\n" 1
+echo_handler:xmark: 'tainted string.\n' 1
 tainted string.
 bool(true)
diff --git a/tests/taint-bug63123.phpt b/tests/taint-bug63123.phpt
@@ -35,7 +35,7 @@ foreach ($a as $key => $val) {
 
 ?>
 --EXPECT--
-echo_handler:xmark: "a\n" 1
+echo_handler:xmark: 'a\n' 1
 a
-echo_handler:xmark: "b\n" 1
+echo_handler:xmark: 'b\n' 1
 b
diff --git a/tests/taint002.phpt b/tests/taint002.phpt
@@ -35,8 +35,8 @@ eval("return '$a';");
 
 ?>
 --EXPECT--
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
 file_put_contents:xcheck: data 1
 tainted string+
-include_or_eval_handler:xmark: "return 'tainted string+';" 1
+include_or_eval_handler:xmark: 'return \'tainted string+\';' 1
diff --git a/tests/taint003.phpt b/tests/taint003.phpt
@@ -22,8 +22,8 @@ exit($b);
 
 ?>
 --EXPECT--
-echo_handler:xmark: "tainted string" 1
+echo_handler:xmark: 'tainted string' 1
 tainted string
 bool(true)
-exit_handler:xmark: "tainted stringxxxx" 1
+exit_handler:xmark: 'tainted stringxxxx' 1
 tainted stringxxxx
diff --git a/tests/taint004.phpt b/tests/taint004.phpt
@@ -17,5 +17,5 @@ die($b);
 
 ?>
 --EXPECT--
-exit_handler:xmark: "tainted string." 1
+exit_handler:xmark: 'tainted string.' 1
 tainted string.
diff --git a/tests/taint005.phpt b/tests/taint005.phpt
@@ -23,11 +23,11 @@ print $a;
 
 ?>
 --EXPECT--
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
diff --git a/tests/taint006.phpt b/tests/taint006.phpt
@@ -45,17 +45,17 @@ test2($e);
 ?>
 --EXPECT--
 ======= normal test ======
-echo_handler:xmark: "a tainted string\n" 1
+echo_handler:xmark: 'a tainted string\n' 1
 a tainted string
-echo_handler:xmark: "a tainted string\n" 1
+echo_handler:xmark: 'a tainted string\n' 1
 a tainted string
 ======= normal a&b ======
-echo_handler:xmark: "a tainted string\n" 1
+echo_handler:xmark: 'a tainted string\n' 1
 a tainted string
-echo_handler:xmark: "a tainted string\n" 1
+echo_handler:xmark: 'a tainted string\n' 1
 a tainted string
 ======= normal c&d ======
-echo_handler:xmark: "c tainted string\n" 1
+echo_handler:xmark: 'c tainted string\n' 1
 c tainted string
-echo_handler:xmark: "c tainted string\n" 1
+echo_handler:xmark: 'c tainted string\n' 1
 c tainted string
diff --git a/tests/taint011.phpt b/tests/taint011.phpt
@@ -22,7 +22,7 @@ echo $var;
 
 ?>
 --EXPECT--
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
-echo_handler:xmark: "tainted string\n" 1
+echo_handler:xmark: 'tainted string\n' 1
 tainted string
diff --git a/tests/taint012.phpt b/tests/taint012.phpt
@@ -59,15 +59,15 @@ test();
 ?>
 --EXPECT--
 ====== dirname =======
-echo_handler:xmark: "\/home\/fate0\/playstation" 1
+echo_handler:xmark: '/home/fate0/playstation' 1
 /home/fate0/playstation
 ====== basename =======
-echo_handler:xmark: "assassin's creed" 1
+echo_handler:xmark: 'assassin\'s creed' 1
 assassin's creed
 ====== pathinfo1 =======
-echo_handler:xmark: "assassin's creed" 1
+echo_handler:xmark: 'assassin\'s creed' 1
 assassin's creed
 ====== pathinfo2 =======
-echo_handler:xmark: "\/home\/fate0\/playstation" 1
+echo_handler:xmark: '/home/fate0/playstation' 1
 /home/fate0/playstation
 ====== end =======
diff --git a/tests/taint014.phpt b/tests/taint014.phpt
@@ -31,8 +31,8 @@ call_user_func(array($d, $fname));
 
 ?>
 --EXPECTF--
-init_user_dynamic_call_handler:xcheck: "test" 1
-init_user_dynamic_call_handler:xcheck: "test" 1
-init_user_dynamic_call_handler:xcheck: "test" 1
-init_user_dynamic_call_handler:xcheck: "test" 1
-init_user_dynamic_call_handler:xcheck: "test" 1
+init_user_dynamic_call_handler:xcheck: 'test' 1
+init_user_dynamic_call_handler:xcheck: 'test' 1
+init_user_dynamic_call_handler:xcheck: 'test' 1
+init_user_dynamic_call_handler:xcheck: 'test' 1
+init_user_dynamic_call_handler:xcheck: 'test' 1

Original file line number	Diff line number	Diff line change
`@@ -24,36 +24,41 @@ function xcheck_var($var, $recursive=true) {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`
	`27`	`+function repr($var) {`
	`28`	`+ return addcslashes(var_export($var, true), "\n\r\t");`
	`29`	`+}`
	`30`	`+`
	`31`	`+`
`27`	`32`	`function echo_handler($string) {`
`28`	`33`	`if (is_string($string) && xcheck($string)) {`
`29`		`- echo "echo_handler:xmark: ".json_encode($string)." ".xcheck($string)."\n";`
	`34`	`+ echo "echo_handler:xmark: ".repr($string)." ".xcheck($string)."\n";`
`30`	`35`	`}`
`31`	`36`	`}`
`32`	`37`
`33`	`38`	`function exit_handler($string) {`
`34`	`39`	`if (is_string($string) && xcheck($string)) {`
`35`		`- echo "exit_handler:xmark: ".json_encode($string)." ".xcheck($string)."\n";`
	`40`	`+ echo "exit_handler:xmark: ".repr($string)." ".xcheck($string)."\n";`
`36`	`41`	`}`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`function init_user_dynamic_call_handler($funcname) {`
`40`	`45`	`if (is_string($funcname)) {`
`41`	`46`	`if (xcheck($funcname)) {`
`42`		`- echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname)." ".xcheck($funcname)."\n";`
	`47`	`+ echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname)." ".xcheck($funcname)."\n";`
`43`	`48`	`}`
`44`	`49`	`} else if (is_array($funcname)) {`
`45`	`50`	`if (xcheck($funcname[0])) {`
`46`		`- echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname[0])." ".xcheck($funcname[0])."\n";`
	`51`	`+ echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname[0])." ".xcheck($funcname[0])."\n";`
`47`	`52`	`}`
`48`	`53`	`if (xcheck($funcname[1])) {`
`49`		`- echo "init_user_dynamic_call_handler:xcheck: ".json_encode($funcname[1])." ".xcheck($funcname[1])."\n";`
	`54`	`+ echo "init_user_dynamic_call_handler:xcheck: ".repr($funcname[1])." ".xcheck($funcname[1])."\n";`
`50`	`55`	`}`
`51`	`56`	`}`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`function include_or_eval_handler($param) {`
`55`	`60`	`if (xcheck($param)) {`
`56`		`- echo "include_or_eval_handler:xmark: ".json_encode($param)." ".xcheck($param)."\n";`
	`61`	`+ echo "include_or_eval_handler:xmark: ".repr($param)." ".xcheck($param)."\n";`
`57`	`62`	`}`
`58`	`63`	`}`
`59`	`64`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ foreach ($a as $key => $val) {`
`35`	`35`
`36`	`36`	`?>`
`37`	`37`	`--EXPECT--`
`38`		`-echo_handler:xmark: "a\n" 1`
	`38`	`+echo_handler:xmark: 'a\n' 1`
`39`	`39`	`a`
`40`		`-echo_handler:xmark: "b\n" 1`
	`40`	`+echo_handler:xmark: 'b\n' 1`
`41`	`41`	`b`