1
0
mirror of https://github.com/php/php-src.git synced 2026-03-27 09:42:22 +01:00
Commit Graph

170 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
3960def881 Fixed bug #61482, caused by the fix to bug #61418.
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
2012-03-23 11:19:19 +00:00
Gustavo André dos Santos Lopes
85725337d5 Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482"
This reverts commit a89c4a34ee.
2012-03-23 09:40:27 +00:00
Stanislav Malyshev
a89c4a34ee Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
This reverts commit 714f1ff4b3.
2012-03-22 22:29:50 -07:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting"
This reverts commit 14af1fe692.
2012-03-22 15:51:58 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Gustavo André dos Santos Lopes
714f1ff4b3 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
72a133f155 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Gustavo André dos Santos Lopes
cd2cdd256a - Make SplFileInfo::_bad_state_ex final. 2011-04-05 08:38:09 +00:00
Gustavo André dos Santos Lopes
2975308e1a - Fixed bug #54384 (Dual iterators, GlobIterator, SplFileObject and
SplTempFileObject crash when user-space classes don't call the paren
  constructor).
2011-04-04 02:50:27 +00:00
Felipe Pena
0ab7f1cebf - Fixed bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) 2011-03-23 22:46:04 +00:00
Gustavo André dos Santos Lopes
f06e3ba5c1 - Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting
with \0).
2011-03-19 23:15:04 +00:00
Felipe Pena
c7e7de3485 - Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance segfaults) 2011-03-08 19:56:29 +00:00
Felipe Pena
54a7e5d7c3 - Fixed memory leak in DirectoryIterator::getExtension() and SplFileInfo::getExtension() 2011-02-20 16:33:53 +00:00
Peter Cowburn
14c6cc5b7f MFH - Added SplFileInfo::getExtension() (FR #48767) 2011-02-11 22:07:22 +00:00
Adam Harvey
a7d4b80ca2 Fix bug #53914 (SPL assumes HAVE_GLOB is defined). Original patch by Chris
Jones; test updates by myself.
2011-02-04 10:49:49 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
6958cb4a14 - Added missing void arg checks 2010-11-14 18:40:08 +00:00
Adam Harvey
84dc845ff8 Fix bug #53279 (SplFileObject doesn't initialise default CSV escape character). 2010-11-09 14:53:23 +00:00
Pierre Joye
2b04364852 - Implement bug #51804, splFileInfo::getLinkTarget() on Windows 2010-09-10 14:17:40 +00:00
Felipe Pena
2fb2f81538 - Improved fix for bug #52573 2010-08-18 01:59:37 +00:00
Felipe Pena
658272c9ee - Fixed bug #52573 (SplFileObject::fscanf Segmentation fault) 2010-08-10 22:37:24 +00:00
Etienne Kneuss
a5d361e3ea Fixed #48361 (SplFileInfo::getPathName() should return the parent 2010-04-27 08:56:01 +00:00
Etienne Kneuss
c200eeeb61 Fix #51374 (Wrongly initialized object properties) 2010-04-27 05:58:39 +00:00
Etienne Kneuss
eb88d58e6c Fix #51532 (Invalid prototype for SplFileInfo::fscanf) 2010-04-25 05:18:42 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
855034b955 - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference) 2009-07-23 14:42:46 +00:00
Ilia Alshanetsky
c16b7585f6 Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked
directories).

[DOC]

To avoid breaking how existing code works a new constant is introduced for
the RecursiveDirectoryIterator() that directs the code to follow symlinks.
This constant RecursiveDirectoryIterator::FOLLOW_SYMLINKS can be passed a
flag to the constructor to trigger symlink following.
2009-07-08 03:06:59 +00:00
Felipe Pena
fc4e43ec3c MFH:
- Added missing methods' arginfo (for void params)
- Fixed arginfos:
  - MultipleIterator::__construct
  - MultipleIterator::setFlags      (Thanks Philip!)
  - SplFixedArray::__construct
2009-07-04 20:31:27 +00:00
Dmitry Stogov
e583ce82ec Fixed bug #48643 (String functions memory issue) 2009-06-24 08:53:18 +00:00
Etienne Kneuss
b8d64e4085 MFH: Include other flags as well 2009-06-04 14:46:26 +00:00
Etienne Kneuss
bc75208538 MFH: Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring CURRENT_AS_PATHNAME) 2009-05-09 21:06:59 +00:00
Marcus Boerger
3baf61b513 - MFH Safer flag handling as requested by Greg 2009-03-10 23:28:17 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Etienne Kneuss
f48d22afa1 MFH: Fix #46646 (Implement zend functions to restrict serialization or internal classes) 2008-12-22 14:11:49 +00:00
Dmitry Stogov
7d4fd3fd38 Fixed bug #46409 (__invoke method called outside of object context when using array_map) 2008-11-27 19:01:23 +00:00
Etienne Kneuss
3919b16f04 MFH: Fix #46241 (stacked error_handlers, error_handling in general) 2008-11-19 02:00:53 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Etienne Kneuss
e415c37ed4 MFH: Fix #46421 (Take care about /) 2008-11-06 01:07:22 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
261f0c32a5 initialize optional vars 2008-10-21 22:08:20 +00:00
Arnaud Le Blanc
c238cb8f84 MFH: Fixed #46053 (SplFileObject::seek - Endless loop) 2008-09-11 15:31:58 +00:00
Arnaud Le Blanc
7f5079ab3a MFH: Fixed #46051 (SplFileInfo::openFile - memory overlap) 2008-09-11 15:22:49 +00:00
Etienne Kneuss
c77ca4c34a MFH: Fix error_handling usage in various extensions 2008-08-08 22:07:07 +00:00
Dmitry Stogov
691d4a6999 Fixed uninitialised data 2008-07-25 08:23:07 +00:00
Steph Fox
0aeea4bdbf MFH SPL_FILE_DIR_UNIXPATHS. 2008-07-24 08:55:52 +00:00
Marcus Boerger
d78f5554e7 - [DOC] Add FilesystemIterator::SKIP_DOTS (flag to skip '.' and '..' in iteration) 2008-07-23 06:12:29 +00:00