com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/dom/document.c ext/gd/gd.c ext/standard/exec.c
| From: | Stanislav Malyshev | Date: | Tue, 09 Jun 2015 22:31:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/dom/document.c ext/gd/gd.c ext/standard/exec.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87135@lists.php.net to get a copy of this message | ||
Commit: 4e2fb470929ab13101c945e76e2ac397a730ba5a
Author: Stanislav Malyshev <stas@php.net> Tue, 9 Jun 2015 15:31:27 -0700
Parents: 5f7c1917e3ab7ef7120dba6b2a3c46601781ea22 80367584910885baa1a2a4476a4a31efdcf0c9c0
Branches: PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e2fb470929ab13101c945e76e2ac397a730ba5a
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
Bugs:
https://bugs.php.net/69646
https://bugs.php.net/69719
https://bugs.php.net/68812
Changed paths:
MM ext/dom/document.c
MM ext/gd/gd.c
MM ext/standard/exec.c
Diff:
diff --cc ext/dom/document.c
index 8b62e92,097fcba..d82ca92
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@@ -1991,7 -1990,7 +1991,7 @@@ static void _dom_document_schema_valida
int is_valid;
char resolved_path[MAXPATHLEN + 1];
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id,
dom_document_class_entry, &source, &source_len, &flags) == FAILURE) {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id,
dom_document_class_entry, &source, &source_len) == FAILURE) {
++ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id,
dom_document_class_entry, &source, &source_len, &flags) == FAILURE) {
return;
}