]> granicus.if.org Git - php/commitdiff
- Fixed bug #60860 (session.save_handler=user without defined function core dumps)
authorFelipe Pena <felipe@php.net>
Sat, 28 Jan 2012 01:24:54 +0000 (01:24 +0000)
committerFelipe Pena <felipe@php.net>
Sat, 28 Jan 2012 01:24:54 +0000 (01:24 +0000)
ext/session/mod_user.c
ext/session/tests/bug60860.phpt [new file with mode: 0644]

index cf13e4b46efccab93090d0f35422d5b955266dbd..2ff5302f7820490602d1476d87a94fd405551552 100644 (file)
@@ -80,6 +80,13 @@ PS_OPEN_FUNC(user)
 {
        zval *args[2];
        STDVARS;
+       
+       if (PSF(open) == NULL) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "user session functions not defined");
+                       
+               return FAILURE;
+       }
 
        SESS_ZVAL_STRING((char*)save_path, args[0]);
        SESS_ZVAL_STRING((char*)session_name, args[1]);
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
new file mode 100644 (file)
index 0000000..1231020
--- /dev/null
@@ -0,0 +1,17 @@
+--TEST--
+Bug #60860 (session.save_handler=user without defined function core dumps)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--INI--
+session.save_handler=user
+--FILE--
+<?php
+
+session_start();
+echo "ok\n";
+
+?>
+--EXPECTF--
+Warning: session_start(): user session functions not defined in %s on line 3
+
+Fatal error: session_start(): Failed to initialize storage module: user (path: ) in %s on line 3