summaryrefslogtreecommitdiffstats
path: root/xdebug-upstream.patch
diff options
context:
space:
mode:
Diffstat (limited to 'xdebug-upstream.patch')
-rw-r--r--xdebug-upstream.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/xdebug-upstream.patch b/xdebug-upstream.patch
new file mode 100644
index 0000000..c0d73fb
--- /dev/null
+++ b/xdebug-upstream.patch
@@ -0,0 +1,28 @@
+From ac8557ff69d2961e91a9212a81ef5eb535beda5f Mon Sep 17 00:00:00 2001
+From: Derick Rethans <github@derickrethans.nl>
+Date: Sun, 8 Nov 2015 20:35:36 -0500
+Subject: [PATCH] Fixed issue #1195: Segfault with code coverage and foreach
+
+---
+ tests/bug01195-php5.phpt | 37 +++++++++++++++++++++++++++++++++++++
+ tests/bug01195-php7.phpt | 38 ++++++++++++++++++++++++++++++++++++++
+ tests/bug01195.inc | 12 ++++++++++++
+ xdebug_code_coverage.c | 2 +-
+ 4 files changed, 88 insertions(+), 1 deletion(-)
+ create mode 100644 tests/bug01195-php5.phpt
+ create mode 100644 tests/bug01195-php7.phpt
+ create mode 100644 tests/bug01195.inc
+
+diff --git a/xdebug_code_coverage.c b/xdebug_code_coverage.c
+index 6c52f81..85a9752 100644
+--- a/xdebug_code_coverage.c
++++ b/xdebug_code_coverage.c
+@@ -615,7 +615,7 @@ static int xdebug_find_jump(zend_op_array *opa, unsigned int position, long *jmp
+ #endif
+ *jmp1 = position + 1;
+ #if PHP_VERSION_ID >= 70000
+- *jmp2 = XDEBUG_ZNODE_JMP_LINE(opcode.op2, position, base_address) * sizeof(zend_op);
++ *jmp2 = XDEBUG_ZNODE_JMP_LINE(opcode.op2, position, base_address);
+ #else
+ *jmp2 = XDEBUG_ZNODE_ELEM(opcode.op2, opline_num);
+ #endif