]> granicus.if.org Git - php/commitdiff
- Fixed memory leak when calling SessionHandler::open() several times
authorFelipe Pena <felipe@php.net>
Wed, 14 Sep 2011 01:45:57 +0000 (01:45 +0000)
committerFelipe Pena <felipe@php.net>
Wed, 14 Sep 2011 01:45:57 +0000 (01:45 +0000)
ext/session/mod_files.c
ext/session/tests/sessionhandler_open_001.phpt [new file with mode: 0644]

index c3c35093c3558d792aec647345780593628b18d9..b0687fac15b031cd86f42843953abfc82913c657 100644 (file)
@@ -311,6 +311,9 @@ PS_OPEN_FUNC(files)
        data->basedir_len = strlen(save_path);
        data->basedir = estrndup(save_path, data->basedir_len);
 
+       if (PS_GET_MOD_DATA()) {
+               ps_close_files(mod_data TSRMLS_CC);
+       }
        PS_SET_MOD_DATA(data);
 
        return SUCCESS;
diff --git a/ext/session/tests/sessionhandler_open_001.phpt b/ext/session/tests/sessionhandler_open_001.phpt
new file mode 100644 (file)
index 0000000..6ade9e0
--- /dev/null
@@ -0,0 +1,19 @@
+--TEST--
+Testing repated SessionHandler::open() calls
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php  
+
+ini_set('session.save_handler', 'files');
+$x = new SessionHandler;
+$x->open('','');
+$x->open('','');
+$x->open('','');
+$x->open('','');
+
+print "Done!\n";
+
+?>
+--EXPECTF--
+Done!