cvs: php-src /ext/standard streamsfuncs.c
| From: | Ilia Alshanetsky | Date: | Sun, 03 Feb 2008 16:14:44 +0000 |
| Subject: | cvs: php-src /ext/standard streamsfuncs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-48293@lists.php.net to get a copy of this message | ||
iliaa Sun Feb 3 16:14:44 2008 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
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.111&r2=1.112&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.111 php-src/ext/standard/streamsfuncs.c:1.112
--- php-src/ext/standard/streamsfuncs.c:1.111 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/streamsfuncs.c Sun Feb 3 16:14:44 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.111 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: streamsfuncs.c,v 1.112 2008/02/03 16:14:44 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1487,6 +1487,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);