Attachment 192772 Details for Bug 227723 – Patch created by dim@

[patch] Patch created by dim@

lang__php56-fix-segfault-1.diff (text/plain), 2.63 KB, created by Florian Smeets on 2018-04-24 07:13:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Smeets

Created: 2018-04-24 07:13:22 UTC

Size: 2.63 KB

patch

obsolete

>Index: lang/php56/files/patch-Zend_zend__compile.h
>===================================================================
>--- lang/php56/files/patch-Zend_zend__compile.h	(nonexistent)
>+++ lang/php56/files/patch-Zend_zend__compile.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- Zend/zend_compile.h.orig	2018-02-27 23:15:25 UTC
>++++ Zend/zend_compile.h
>+@@ -414,9 +414,6 @@ struct _zend_execute_data {
>+ 
>+ #define EX(element) execute_data.element
>+ 
>+-#define EX_TMP_VAR(ex, n)	   ((temp_variable*)(((char*)(ex)) + ((int)(n))))
>+-#define EX_TMP_VAR_NUM(ex, n)  (EX_TMP_VAR(ex, 0) - (1 + (n)))
>+-
>+ #define EX_CV_NUM(ex, n)       (((zval***)(((char*)(ex))+ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data))))+(n))
>+ 
>+ 
>
>Property changes on: lang/php56/files/patch-Zend_zend__compile.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/php56/files/patch-Zend_zend__execute.h
>===================================================================
>--- lang/php56/files/patch-Zend_zend__execute.h	(nonexistent)
>+++ lang/php56/files/patch-Zend_zend__execute.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- Zend/zend_execute.h.orig	2018-02-27 23:15:25 UTC
>++++ Zend/zend_execute.h
>+@@ -71,6 +71,15 @@ ZEND_API int zend_eval_stringl_ex(char *str, int str_l
>+ ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, const char **class_name, zend_class_entry **pce TSRMLS_DC);
>+ ZEND_API int zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind TSRMLS_DC);
>+ 
>++static zend_always_inline temp_variable *EX_TMP_VAR(void *ex, int n)
>++{
>++	return (temp_variable *)((zend_uintptr_t)ex + n);
>++}
>++static inline temp_variable *EX_TMP_VAR_NUM(void *ex, int n)
>++{
>++	return (temp_variable *)((zend_uintptr_t)ex - (1 + n) * sizeof(temp_variable));
>++}
>++
>+ static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
>+ {
>+ 	if (!Z_DELREF_P(zval_ptr)) {
>
>Property changes on: lang/php56/files/patch-Zend_zend__execute.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 227723: 192772