[PHP-CVS] com php-src: Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails): Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-06 Thread Xinchen Hui 
Commit:a831499b4a1029118dc45375e62af42043110ade
Author:Xinchen Hui larue...@php.net Tue, 6 Aug 2013 15:37:20 +0800
Parents:   47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c
Branches:  PHP-5.4 PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=a831499b4a1029118dc45375e62af42043110ade

Log:
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference 
fails)

Missed a zval_copy_ctor there

Bugs:
https://bugs.php.net/65372

Changed paths:
  M  Zend/zend_vm_def.h
  M  Zend/zend_vm_execute.h


Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 83e40b5..09d0b21 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2914,6 +2914,7 @@ ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, 
CONST|TMP|VAR|CV, ANY)
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+   zval_copy_ctor(ret);
*EG(return_value_ptr_ptr) = ret;
}
break;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 339e34b..4917cb6 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2328,6 +2328,7 @@ static int ZEND_FASTCALL  
ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+   zval_copy_ctor(ret);
*EG(return_value_ptr_ptr) = ret;
}
break;
@@ -6749,6 +6750,7 @@ static int ZEND_FASTCALL  
ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+   zval_copy_ctor(ret);
*EG(return_value_ptr_ptr) = ret;
}
break;
@@ -11063,6 +11065,7 @@ static int ZEND_FASTCALL  
ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+   zval_copy_ctor(ret);
*EG(return_value_ptr_ptr) = ret;
}
break;
@@ -27040,6 +27043,7 @@ static int ZEND_FASTCALL  
ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER
 
ALLOC_ZVAL(ret);
INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+   zval_copy_ctor(ret);
*EG(return_value_ptr_ptr) = ret;
}
break;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-06 Thread Xinchen Hui 
Commit:9b38673776fdd2501119acea04f9c5869a007cf1
Author:Xinchen Hui larue...@php.net Tue, 6 Aug 2013 15:39:46 +0800
Parents:   ca0497bbac282c39048776a9f61052e67643 
aa042d0c351056d4ee5ecc994cd596f7fbb427ea
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=9b38673776fdd2501119acea04f9c5869a007cf1

Log:
Merge branch 'PHP-5.5'

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-06 Thread Xinchen Hui 
Commit:aa042d0c351056d4ee5ecc994cd596f7fbb427ea
Author:Xinchen Hui larue...@php.net Tue, 6 Aug 2013 15:39:33 +0800
Parents:   6e505f496905529a7976f0873a69fc222fe2d617 
a831499b4a1029118dc45375e62af42043110ade
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=aa042d0c351056d4ee5ecc994cd596f7fbb427ea

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] com php-src: Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails): Zend/zend_vm_def.h Zend/zend_vm_execute.h

2013-08-06 Thread Stas Malyshev 
Hi!

 Commit:a831499b4a1029118dc45375e62af42043110ade
 Author:Xinchen Hui larue...@php.net Tue, 6 Aug 2013 15:37:20 
 +0800
 Parents:   47d66a0b4ea83bc4e1c9bfaa5c478cd42e28337c
 Branches:  PHP-5.4 PHP-5.5 master
 
 Link:   
 http://git.php.net/?p=php-src.git;a=commitdiff;h=a831499b4a1029118dc45375e62af42043110ade
 
 Log:
 Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference 
 fails)
 
 Missed a zval_copy_ctor there
 
 Bugs:
 https://bugs.php.net/65372
 
 Changed paths:
   M  Zend/zend_vm_def.h
   M  Zend/zend_vm_execute.h
 

We should be adding unit tests for such things, if we have reproducing
script.


-- 
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: One more './configure --help' alignment fix: build/libtool.m4

2013-08-06 Thread Christopher Jones 
Commit:c932d532c8d858bed66b5393cc8d7be21f26dd2e
Author:Christopher Jones s...@php.net Tue, 6 Aug 2013 11:23:02 
-0700
Parents:   c6d977dd395262c5c8d9091519a41aebe6f40db9
Branches:  PHP-5.5 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=c932d532c8d858bed66b5393cc8d7be21f26dd2e

Log:
One more './configure --help' alignment fix

Changed paths:
  M  build/libtool.m4


Diff:
diff --git a/build/libtool.m4 b/build/libtool.m4
index dcd2aea..56658cc 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -2103,7 +2103,8 @@ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([fast-install],
 changequote(, )dnl
-  --enable-fast-install[=PKGS]  Optimize for fast installation 
[default=AC_ENABLE_FAST_INSTALL_DEFAULT],
+  --enable-fast-install[=PKGS]
+  Optimize for fast installation 
[default=AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case $enableval in


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': configure.in ext/oci8/config.m4 ext/simplexml/config.m4

2013-08-06 Thread Christopher Jones 
Commit:4c3c9d1fe585abaa59213dedd04996b8fb9f041a
Author:Christopher Jones s...@php.net Tue, 6 Aug 2013 11:09:12 
-0700
Parents:   db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087 
c6d977dd395262c5c8d9091519a41aebe6f40db9
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=4c3c9d1fe585abaa59213dedd04996b8fb9f041a

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' 
text. Whitespace changes and a couple of grammar fixes.

Changed paths:
  MM  configure.in
  MM  ext/oci8/config.m4
  MM  ext/simplexml/config.m4


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php