-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (270 commits) Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org) exif NEWS add tests for bug #62523 Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h fix bug #65936 (dangling context pointer causes crash) remove TRAVIS check in test source Fixed compilation warning Just SKIP that test on travis Fixed issue #115 (path issue when using phar). fix memory leak on error (from Coverity scan) fix argument type & remove warning fix const warnings in intl methods Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag fix possibility of access to *storedType without initialization Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 5.4.21 release date fix argument type & remove warning fix const warnings in intl methods When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt. Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag ...
- Loading branch information
Showing
514 changed files
with
13,887 additions
and
7,520 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
--TEST-- | ||
Bug #60598 (cli/apache sapi segfault on objects manipulation) | ||
--FILE-- | ||
<?php | ||
define('OBJECT_COUNT', 10000); | ||
|
||
$containers = array(); | ||
|
||
class Object { | ||
protected $_guid = 0; | ||
public function __construct() { | ||
global $containers; | ||
$this->guid = 1; | ||
$containers[spl_object_hash($this)] = $this; | ||
} | ||
public function __destruct() { | ||
global $containers; | ||
$containers[spl_object_hash($this)] = NULL; | ||
} | ||
} | ||
|
||
for ($i = 0; $i < OBJECT_COUNT; ++$i) { | ||
new Object(); | ||
} | ||
|
||
// You probably won't see this because of the "zend_mm_heap corrupted" | ||
?> | ||
If you see this, try to increase OBJECT_COUNT to 100,000 | ||
--EXPECT-- | ||
If you see this, try to increase OBJECT_COUNT to 100,000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
--TEST-- | ||
Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects) | ||
--XFAIL-- | ||
We can not fix this bug without a significant (performace slow down) change to gc | ||
--FILE-- | ||
<?php | ||
$bar = NULL; | ||
class bad | ||
{ | ||
private $_private = array(); | ||
|
||
public function __construct() | ||
{ | ||
$this->_private[] = 'php'; | ||
} | ||
|
||
public function __destruct() | ||
{ | ||
global $bar; | ||
$bar = $this; | ||
} | ||
} | ||
|
||
$foo = new stdclass; | ||
$foo->foo = $foo; | ||
$foo->bad = new bad; | ||
|
||
gc_disable(); | ||
|
||
unserialize(serialize($foo)); | ||
gc_collect_cycles(); | ||
var_dump($bar); | ||
/* will output: | ||
object(bad)#4 (1) { | ||
["_private":"bad":private]=> | ||
&UNKNOWN:0 | ||
} | ||
*/ | ||
?> | ||
--EXPECTF-- | ||
bject(bad)#%d (1) { | ||
["_private":"bad":private]=> | ||
array(1) { | ||
[0]=> | ||
string(3) "php" | ||
} | ||
} |
Oops, something went wrong.