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.

Sign up for GitHub

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

Jump to bottom

[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

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

wants to merge 59 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 5, 2013

See #1000

This is #1003 backported to 1.2.2

sjinks and others added 30 commits July 25, 2013 21:40
@sjinks
Fix #910, 914
349d92f 
(cherry picked from commit 16280ffe6c16788af8973eb31cef7948d955b74b)

Conflicts:
	ext/kernel/memory.c
@sjinks
The root memory frame survives across requests
e6dd0c6 
(cherry picked from commit e18a27c)

Conflicts:
	ext/phalcon.c
@sjinks
Do not restore stack too many times
fab2bec 
(cherry picked from commit 6e77ea7ce647b8e8f6f2b4c7855b50817636bf9d)
@sjinks
Fix bug in phalcon_escape_multi() introduced in 1ce094c
8a13e56 
(cherry picked from commit e12bfdd)
@sjinks
Fix #908
161a521 
(cherry picked from commit a3a4256)
@sjinks
Commented out listenLowSeverity()
f629393 
(cherry picked from commit 3622be4)
@sjinks
Fix invalid memory reads when GC is on
aa5ca68 
(cherry picked from commit 46f3955)
@sjinks
Fix #701
df85c04 
(cherry picked from commit 5ad9ddc)
@sjinks
Bumped version to 1.2.2
3b216f9
@sjinks
Regenerated builds
f67f165
@niden
Merge branch '1.2.1-sj' of git://github.com/sjinks/cphalcon into sjin…
6ad7360 
…ks-1.2.1-sj

Conflicts:
	build/32bits/phalcon.c
	build/64bits/phalcon.c
	build/safe/phalcon.c
	ext/kernel/memory.c
@niden
Regenerated Builds
123d5ae
@sjinks @niden
Updated changelog for 1.2.2
d6c3e08
@dreamsxin
Add scale to decimal
7086ac4
@dreamsxin
reset format
35a696e
@dreamsxin
reset format
ae32615
@dreamsxin
push db/dialect/postgresql.c
b73de86
@dreamsxin
use PHALCON_OBS_NVAR
d688e90
@dreamsxin
Update unit-tests/DbDescribeTest.php
10b90b2
@dreamsxin
Update sqlite.c
e0671a3 
@sjinks updated size_pattern
@dreamsxin
Update mysql.c
a3550b4 
@sjinks updated pattern
Merge pull request #935 from dreamsxin/decimal_scale
975e8bd 
Add Decimal scale
@dreamsxin
Fix bug #826
cffb538
Merge pull request #941 from dreamsxin/paginator_adapter_model
255e062 
Fix Bug #826 1.2.2
@dreamsxin
Fix bug #951
dbf610a
@dreamsxin
Fix bug #951
8e916c6
@dreamsxin
Update manager function output param
7d7a268
@dreamsxin
addJs/addCss call resource __construct add param type
c25d130
@dreamsxin
Updated
22ad839
@dreamsxin
reset call resource __construct param
5e0af70
dreamsxin and others added 29 commits July 31, 2013 10:44
@dreamsxin
Format
ec7602c
@dreamsxin
Update manager.h
33abf69 
update manager.h add param
Merge pull request #957 from dreamsxin/assets951
0590af0 
Fix bug #951
@sjinks
'New' means 'new', not 'clone'
cf034fb 
(cherry picked from commit 662351e)
@sjinks
Fix #938
36b9458 
(cherry picked from commit 1f46863)
@sjinks
Added unit test
ef56f77 
(cherry picked from commit a87701f)
@sjinks
Fixed tests
f2eb8d5 
(cherry picked from commit 023d349)
Merge pull request #966 from sjinks/has_many_to_many
fdff06d 
[1.2.2] Fix broken hasManyToMany()
@sjinks
unused variable ‘i’
4d70804
@sjinks
‘marker’ may be used uninitialized in this function
f8a0f75
@sjinks
‘uidx’ may be used uninitialized in this function
328d88e
@sjinks
‘regexp_length’ may be used uninitialized in this function
634c1f6
@sjinks
variable may be used uninitialized in this function
60da6fa
@sjinks
‘parser.tmp_state’ may be used uninitialized in this function
2980d24
@sjinks
‘marker’ may be used uninitialized in this function
fdaa645
@sjinks
‘phql_key’ may be used uninitialized in this function
2b8f420
@sjinks
Regenerated builds
e740ecb
Merge pull request #967 from sjinks/compiler-warnings
b04d46b 
[1.2.2] Fix all compiler warnings
@sjinks
Fix #980
cc1fe15 
(cherry picked from commit b59c33d)
@sjinks
Unit test
9d72ad3 
(cherry picked from commit 1b2f780)
Merge pull request #982 from sjinks/issue-980-1.2.2
134186b 
[1.2.2] Segfault in unserialize()
@sjinks
Fix segfault when GC is on
45fbecb 
(cherry picked from commit c4afe0a)
Merge pull request #985 from sjinks/segfault-config-1.2.2
a2c5980 
[1.2.2] [Regression] Fix segfault when GC is ON
@sjinks
Fix typo in the method name
ba1371e 
(cherry picked from commit a3a5dcbefe8f5901c804354b6fe25bc233a5115c)
@sjinks
Test case
2c43eab 
(cherry picked from commit c13b970685b851ca8ca97eaa08574037f0623c82)
Merge pull request #995 from sjinks/annotations_adapter_1.2.2
7915b80 
[1.2.2] AnnotationsAdapter getProperty error
@sjinks
Test case
6e9f67c 
(cherry picked from commit 3e19d1f)
@sjinks
Fix unrelated bug in Phalcon\Config
627c213 
(cherry picked from commit 0266ad3)
@sjinks
Fix #1000
b1b58cb 
(cherry picked from commit 2722cb6)
@ghost ghost closed this Aug 5, 2013
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sjinks @niden @dreamsxin