Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154

Author: krakjoe

NEWS

@@ -57,6 +57,7 @@ PHP                                                                        NEWS
     parameter). (Bruce Weirdan)
   . Fixed bug #70213 (Unserialize context shared on double class lookup).
     (Taoguang Chen)
+  . Fixed bug #73154 (serialize object with __sleep function crash). (Nikita)
   . Add subject to mail log. (tomsommer)
 
 - Zlib

ext/session/tests/bug66481-win32.phpt

@@ -4,7 +4,6 @@ Bug #66481: Calls to session_name() segfault when session.name is null.
 session.name=
 --SKIPIF--
 <?php include('skipif.inc'); ?>
-<?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?>
 --FILE--
 <?php
 

ext/session/tests/bug66481.phpt

@@ -6,8 +6,6 @@ error_log=
 --SKIPIF--
 <?php 
 include('skipif.inc');
-if(substr(PHP_OS, 0, 3) == "WIN")
-        die("skip Not for Windows");
 ?>
 --FILE--
 <?php

ext/session/tests/rfc1867_invalid_settings-win.phpt

@@ -6,8 +6,6 @@ error_log=
 --SKIPIF--
 <?php 
 include('skipif.inc');
-if(substr(PHP_OS, 0, 3) == "WIN")
-        die("skip Not for Windows");
 ?>
 --FILE--
 <?php

ext/session/tests/rfc1867_invalid_settings.phpt

@@ -2,9 +2,6 @@
 Bug #31422 (No Error-Logging on SoapServer-Side)
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip not valid for windows');
-}
 require_once('skipif.inc');
 ?>
 --INI--

ext/session/tests/rfc1867_invalid_settings_2-win.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #73154: serialize object with __sleep function crash
+--FILE--
+<?php
+class a {
+    public $a;
+    public function __sleep() {
+        $this->a=null;
+        return array();
+    }
+}
+$s = 'a:1:{i:0;O:1:"a":1:{s:1:"a";R:2;}}';
+var_dump(serialize(unserialize($s)));
+?>
+--EXPECT--
+string(22) "a:1:{i:0;O:1:"a":0:{}}"

ext/session/tests/rfc1867_invalid_settings_2.phpt

@@ -860,9 +860,6 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
 			return;
 
 		case IS_OBJECT: {
-				zval retval;
-				zval fname;
-				int res;
 				zend_class_entry *ce = Z_OBJCE_P(struc);
 
 				if (ce->serialize != NULL) {
@@ -891,32 +888,39 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
 				}
 
 				if (ce != PHP_IC_ENTRY && zend_hash_str_exists(&ce->function_table, "__sleep", sizeof("__sleep")-1)) {
+					zval fname, tmp, retval;
+					int res;
+
+					ZVAL_COPY(&tmp, struc);
 					ZVAL_STRINGL(&fname, "__sleep", sizeof("__sleep") - 1);
 					BG(serialize_lock)++;
-					res = call_user_function_ex(CG(function_table), struc, &fname, &retval, 0, 0, 1, NULL);
+					res = call_user_function_ex(CG(function_table), &tmp, &fname, &retval, 0, 0, 1, NULL);
 					BG(serialize_lock)--;
 					zval_dtor(&fname);
 
 					if (EG(exception)) {
 						zval_ptr_dtor(&retval);
+						zval_ptr_dtor(&tmp);
 						return;
 					}
 
 					if (res == SUCCESS) {
 						if (Z_TYPE(retval) != IS_UNDEF) {
 							if (HASH_OF(&retval)) {
-								php_var_serialize_class(buf, struc, &retval, var_hash);
+								php_var_serialize_class(buf, &tmp, &retval, var_hash);
 							} else {
 								php_error_docref(NULL, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize");
 								/* we should still add element even if it's not OK,
 								 * since we already wrote the length of the array before */
 								smart_str_appendl(buf,"N;", 2);
 							}
-							zval_ptr_dtor(&retval);
 						}
+						zval_ptr_dtor(&retval);
+						zval_ptr_dtor(&tmp);
 						return;
 					}
 					zval_ptr_dtor(&retval);
+					zval_ptr_dtor(&tmp);
 				}
 
 				/* fall-through */

ext/soap/tests/bugs/bug31422-win.phpt

@@ -1165,11 +1165,9 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
 					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi")) &&
 						PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
 					) {
-#ifdef PHP_WIN32
 						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);
+#ifdef PHP_WIN32
 						fflush(stderr);
-#else
-						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);
 #endif
 					} else {
 						php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));

ext/soap/tests/bugs/bug31422.phpt

@@ -380,6 +380,9 @@ static void sapi_cli_register_variables(zval *track_vars_array) /* {{{ */
 static void sapi_cli_log_message(char *message, int syslog_type_int) /* {{{ */
 {
 	fprintf(stderr, "%s\n", message);
+#ifdef PHP_WIN32
+	fflush(stderr);
+#endif
 }
 /* }}} */