Commitab03fa7

authored

Fix phpinfo segfaults (#183)

1 parent1ab3c17 commitab03fa7Copy full SHA for ab03fa7

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,10 @@ unsafe extern "C" fn module_info(zend_module: *mut zend_module_entry) {`
`113`	`113`
`114`	`114`	`php_info_print_table_start();`
`115`	`115`	`if !module.version.as_bytes().is_empty(){`
`116`		`-php_info_print_table_row(2,c"version", module.version.as_ptr());`
	`116`	`+php_info_print_table_row(2,c"version".as_ptr(), module.version.as_ptr());`
`117`	`117`	`}`
`118`	`118`	`if !module.author.as_bytes().is_empty(){`
`119`		`-php_info_print_table_row(2,c"authors", module.author.as_ptr());`
	`119`	`+php_info_print_table_row(2,c"authors".as_ptr(), module.author.as_ptr());`
`120`	`120`	`}`
`121`	`121`	`for(key, value)in&module.infos{`
`122`	`122`	`php_info_print_table_row(2, key.as_ptr(), value.as_ptr());`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ fn test_cli() {`
`29`	`29`	`"integration",`
`30`	`30`	`),`
`31`	`31`	`&[`
	`32`	`+&tests_php_dir.join("phpinfo.php"),`
`32`	`33`	`&tests_php_dir.join("arguments.php"),`
`33`	`34`	`&tests_php_dir.join("arrays.php"),`
`34`	`35`	`&tests_php_dir.join("classes.php"),`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+// Copyright (c) 2022 PHPER Framework Team`
	`4`	`+// PHPER is licensed under Mulan PSL v2.`
	`5`	`+// You can use this software according to the terms and conditions of the Mulan`
	`6`	`+// PSL v2. You may obtain a copy of Mulan PSL v2 at:`
	`7`	`+// http://license.coscl.org.cn/MulanPSL2`
	`8`	`+// THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY`
	`9`	`+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO`
	`10`	`+// NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.`
	`11`	`+// See the Mulan PSL v2 for more details.`
	`12`	`+`
	`13`	`+phpinfo();`

Comments

(0)