iliaa Sun Feb 3 16:15:31 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard streamsfuncs.c
/php-src NEWS
Log:
MFB: Fixed bug #44028 (crash inside stream_socket_enable_crypto() when
enabling encryption without crypto type)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.18&r2=1.58.2.6.2.19&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.18
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.19
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.18 Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/streamsfuncs.c Sun Feb 3 16:15:30 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.18 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.19 2008/02/03 16:15:30 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1325,6 +1325,9 @@
if (php_stream_xport_crypto_setup(stream, cryptokind,
sessstream TSRMLS_CC) < 0) {
RETURN_FALSE;
}
+ } else if (enable) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "When enabling
encryption you must specify the crypto type");
+ RETURN_FALSE;
}
ret = php_stream_xport_crypto_enable(stream, enable TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1070&r2=1.2027.2.547.2.1071&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1070 php-src/NEWS:1.2027.2.547.2.1071
--- php-src/NEWS:1.2027.2.547.2.1070 Thu Jan 31 22:00:22 2008
+++ php-src/NEWS Sun Feb 3 16:15:30 2008
@@ -8,6 +8,8 @@
which to group by data is specified. (Ilia)
- Upgraded PCRE to version 7.6 (Nuno)
+- Fixed bug #44028 (crash inside stream_socket_enable_crypto() when enabling
+ encryption without crypto type). (Ilia)
- Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument).
(Ilia)
- Fixed bug #43954 (Memory leak when sending the same HTTP status code
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
