Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.2.2] [CRASH] Fix segmentation fault in zend_std_write_property for PHP 5.4+ #1004

Closed
wants to merge 59 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
349d92f
Fix #910, 914
sjinks Jul 25, 2013
e6dd0c6
The root memory frame survives across requests
sjinks Jul 24, 2013
fab2bec
Do not restore stack too many times
sjinks Jul 25, 2013
8a13e56
Fix bug in phalcon_escape_multi() introduced in 1ce094c60dd4a4ef674cb…
sjinks Jul 25, 2013
161a521
Fix #908
sjinks Jul 25, 2013
f629393
Commented out listenLowSeverity()
sjinks Jul 25, 2013
aa5ca68
Fix invalid memory reads when GC is on
sjinks Jul 25, 2013
df85c04
Fix #701
sjinks Jul 25, 2013
3b216f9
Bumped version to 1.2.2
sjinks Jul 25, 2013
f67f165
Regenerated builds
sjinks Jul 25, 2013
6ad7360
Merge branch '1.2.1-sj' of git://github.com/sjinks/cphalcon into sjin…
niden Jul 25, 2013
123d5ae
Regenerated Builds
niden Jul 25, 2013
d6c3e08
Updated changelog for 1.2.2
sjinks Jul 25, 2013
7086ac4
Add scale to decimal
dreamsxin Jul 26, 2013
35a696e
reset format
dreamsxin Jul 26, 2013
ae32615
reset format
dreamsxin Jul 26, 2013
b73de86
push db/dialect/postgresql.c
dreamsxin Jul 26, 2013
d688e90
use PHALCON_OBS_NVAR
dreamsxin Jul 26, 2013
10b90b2
Update unit-tests/DbDescribeTest.php
dreamsxin Jul 26, 2013
e0671a3
Update sqlite.c
dreamsxin Jul 26, 2013
a3550b4
Update mysql.c
dreamsxin Jul 26, 2013
975e8bd
Merge pull request #935 from dreamsxin/decimal_scale
Jul 27, 2013
cffb538
Fix bug #826
dreamsxin Jul 27, 2013
255e062
Merge pull request #941 from dreamsxin/paginator_adapter_model
Jul 29, 2013
dbf610a
Fix bug #951
dreamsxin Jul 31, 2013
8e916c6
Fix bug #951
dreamsxin Jul 31, 2013
7d7a268
Update manager function output param
dreamsxin Jul 31, 2013
c25d130
addJs/addCss call resource __construct add param type
dreamsxin Jul 31, 2013
22ad839
Updated
dreamsxin Jul 31, 2013
5e0af70
reset call resource __construct param
dreamsxin Jul 31, 2013
ec7602c
Format
dreamsxin Jul 31, 2013
33abf69
Update manager.h
dreamsxin Jul 31, 2013
0590af0
Merge pull request #957 from dreamsxin/assets951
Jul 31, 2013
cf034fb
'New' means 'new', not 'clone'
sjinks Jul 31, 2013
36b9458
Fix #938
sjinks Jul 31, 2013
ef56f77
Added unit test
sjinks Jul 31, 2013
f2eb8d5
Fixed tests
sjinks Jul 31, 2013
fdff06d
Merge pull request #966 from sjinks/has_many_to_many
Aug 1, 2013
4d70804
unused variable ‘i’
sjinks Aug 1, 2013
f8a0f75
‘marker’ may be used uninitialized in this function
sjinks Aug 1, 2013
328d88e
‘uidx’ may be used uninitialized in this function
sjinks Aug 1, 2013
634c1f6
‘regexp_length’ may be used uninitialized in this function
sjinks Aug 1, 2013
60da6fa
variable may be used uninitialized in this function
sjinks Aug 1, 2013
2980d24
‘parser.tmp_state’ may be used uninitialized in this function
sjinks Aug 1, 2013
fdaa645
‘marker’ may be used uninitialized in this function
sjinks Aug 1, 2013
2b8f420
‘phql_key’ may be used uninitialized in this function
sjinks Aug 1, 2013
e740ecb
Regenerated builds
sjinks Aug 1, 2013
b04d46b
Merge pull request #967 from sjinks/compiler-warnings
Aug 1, 2013
cc1fe15
Fix #980
sjinks Aug 2, 2013
9d72ad3
Unit test
sjinks Aug 2, 2013
134186b
Merge pull request #982 from sjinks/issue-980-1.2.2
Aug 2, 2013
45fbecb
Fix segfault when GC is on
sjinks Aug 3, 2013
a2c5980
Merge pull request #985 from sjinks/segfault-config-1.2.2
Aug 3, 2013
ba1371e
Fix typo in the method name
sjinks Aug 4, 2013
2c43eab
Test case
sjinks Aug 4, 2013
7915b80
Merge pull request #995 from sjinks/annotations_adapter_1.2.2
Aug 5, 2013
6e9f67c
Test case
sjinks Aug 5, 2013
627c213
Fix unrelated bug in Phalcon\Config
sjinks Aug 5, 2013
b1b58cb
Fix #1000
sjinks Aug 5, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unit test
(cherry picked from commit 1b2f780)
  • Loading branch information
sjinks committed Aug 2, 2013
commit 9d72ad3e23252eb0baa374f3e8f09fff8bb9c244
8 changes: 8 additions & 0 deletions unit-tests/ConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -291,4 +291,12 @@ public function testConfigWithMergeAndGarbageCollection()
$config->merge(new Phalcon\Config(array('test2')));
gc_collect_cycles();
}

public function testIssue980()
{
$a = new Phalcon\Config(array('aaa' => array('b' => 2, 'c' => 3)));
$s = serialize($a);
$b = unserialize($s);
$this->assertEquals($a, $b);
}
}