diff options
| author | Felipe Pena <felipe@php.net> | 2011-09-14 01:45:57 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-09-14 01:45:57 +0000 |
| commit | a99f146ec4f7a6aed9a3e31b2c9b5b276f878cc1 (patch) | |
| tree | fc4b64e0705f1ae3d8ba640961b39f8a4fdac03c | |
| parent | 465475a7a25d5d260841df916fb57944fe7bda51 (diff) | |
| download | php-git-a99f146ec4f7a6aed9a3e31b2c9b5b276f878cc1.tar.gz | |
- Fixed memory leak when calling SessionHandler::open() several times
| -rw-r--r-- | ext/session/mod_files.c | 3 | ||||
| -rw-r--r-- | ext/session/tests/sessionhandler_open_001.phpt | 19 |
2 files changed, 22 insertions, 0 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index c3c35093c3..b0687fac15 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -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 index 0000000000..6ade9e00a5 --- /dev/null +++ b/ext/session/tests/sessionhandler_open_001.phpt @@ -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! |