cvs: php-src(PHP_5_0) /ext/session session.c
| From: | Antony Dovgal | Date: | Thu, 30 Sep 2004 12:37:36 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28857@lists.php.net to get a copy of this message | ||
tony2001 Thu Sep 30 08:37:36 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/session session.c
Log:
MFH: fix segfaults and bug #30282 and suppress compile warnings
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.391.2.1&r2=1.391.2.2&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.391.2.1 php-src/ext/session/session.c:1.391.2.2
--- php-src/ext/session/session.c:1.391.2.1 Wed Sep 1 22:44:12 2004
+++ php-src/ext/session/session.c Thu Sep 30 08:37:35 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.391.2.1 2004/09/02 02:44:12 iliaa Exp $ */
+/* $Id: session.c,v 1.391.2.2 2004/09/30 12:37:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -424,7 +424,7 @@
if (has_value) {
MAKE_STD_ZVAL(current);
- if (php_var_unserialize(¤t, &p, endptr, &var_hash TSRMLS_CC)) {
+ if (php_var_unserialize(¤t, (const unsigned char**)&p, endptr, &var_hash
TSRMLS_CC)) {
php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
}
zval_ptr_dtor(¤t);
@@ -504,7 +504,7 @@
if (has_value) {
ALLOC_INIT_ZVAL(current);
- if (php_var_unserialize(¤t, &q, endptr, &var_hash TSRMLS_CC)) {
+ if (php_var_unserialize(¤t, (const unsigned char**)&q, endptr, &var_hash
TSRMLS_CC)) {
php_set_session_var(name, namelen, current, &var_hash TSRMLS_CC);
}
zval_ptr_dtor(¤t);
@@ -543,7 +543,11 @@
char *ret = NULL;
IF_SESSION_VARS() {
- if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.save_handler. Failed to encode
session object.");
+ ret = NULL;
+ }
+ else if (PS(serializer)->encode(&ret, newlen TSRMLS_CC) == FAILURE)
ret = NULL;
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot encode non-existent session.");
@@ -554,6 +558,10 @@
static void php_session_decode(const char *val, int vallen TSRMLS_DC)
{
+ if (!PS(serializer)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown session.save_handler. Failed to decode
session object.");
+ return;
+ }
if (PS(serializer)->decode(val, vallen TSRMLS_CC) == FAILURE) {
php_session_destroy(TSRMLS_C);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to decode session object. Session has
been destroyed.");
@@ -1087,6 +1095,21 @@
PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
+
+ if (PS(session_status) == php_session_disabled) {
+ char *value;
+
+ value = zend_ini_string("session.save_handler",
sizeof("session.save_handler"), 0);
+
+ if (value) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot find save handler %s", value);
+ }
+ else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot find unknown save handler");
+ }
+ return;
+ }
+
php_error(E_NOTICE, "A session had already been started - ignoring session_start()");
return;
}
@@ -1495,8 +1518,14 @@
WRONG_PARAM_COUNT;
}
- if (PS(session_status) == php_session_none)
+ if (PS(session_status) == php_session_none || PS(session_status) == php_session_disabled) {
php_session_start(TSRMLS_C);
+ }
+
+ if (PS(session_status) == php_session_disabled) {
+ efree(args);
+ RETURN_FALSE;
+ }
for (i = 0; i < argc; i++) {
if (Z_TYPE_PP(args[i]) == IS_ARRAY)