From 51856a76f87ecb24fe1385342be43610fb6c86e4 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 19 Mar 2015 11:36:01 +0300 Subject: [PATCH] Fixed bug #69152 --- ext/soap/soap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/soap/soap.c b/ext/soap/soap.c index d460c17..41aa1ad 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -919,6 +919,12 @@ PHP_METHOD(SoapFault, __toString) zend_call_function(&fci, NULL TSRMLS_CC); + convert_to_string(faultcode); + convert_to_string(faultstring); + convert_to_string(file); + convert_to_long(line); + convert_to_string(trace); + len = spprintf(&str, 0, "SoapFault exception: [%s] %s in %s:%ld\nStack trace:\n%s", Z_STRVAL_P(faultcode), Z_STRVAL_P(faultstring), Z_STRVAL_P(file), Z_LVAL_P(line), Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n"); -- 2.1.4 From fb83c76deec58f1fab17c350f04c9f042e5977d1 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 22 Mar 2015 18:17:47 -0700 Subject: [PATCH] Check that the type is correct --- ext/standard/incomplete_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 1816ac4..30c82e6 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -144,7 +144,7 @@ PHPAPI char *php_lookup_class_name(zval *object, zend_uint *nlen) object_properties = Z_OBJPROP_P(object); - if (zend_hash_find(object_properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) { + if (zend_hash_find(object_properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS && Z_TYPE_PP(val) == IS_STRING) { retval = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val)); if (nlen) { -- 2.1.4 From a894a8155fab068d68a04bf181dbaddfa01ccbb0 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 5 Apr 2015 17:30:59 -0700 Subject: [PATCH] More fixes for bug #69152 --- Zend/zend_exceptions.c | 3 +++ ext/standard/tests/serialize/bug69152.phpt | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 ext/standard/tests/serialize/bug69152.phpt diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index bf90ae7..1ca2ead 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -536,6 +536,9 @@ ZEND_METHOD(exception, getTraceAsString) str = &res; trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); + if(Z_TYPE_P(trace) != IS_ARRAY) { + RETURN_FALSE; + } zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num); s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1); diff --git a/ext/standard/tests/serialize/bug69152.phpt b/ext/standard/tests/serialize/bug69152.phpt new file mode 100644 index 0000000..4e74168 --- /dev/null +++ b/ext/standard/tests/serialize/bug69152.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #69152: Type Confusion Infoleak Vulnerability in unserialize() +--FILE-- +test(); + +?> +--EXPECTF-- +exception 'Exception' in %s:%d +Stack trace: +#0 {main} + +Fatal error: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide a __autoload() function to load the class definition in %s on line %d -- 2.1.4