Commit 4f28bbd
committed
Fix SOAP bailout handling
This code was reusing the _bailout variable from
SOAP_CLIENT_BEGIN/END_CODE(). As _bailout is not volatile, modifying
it after the setjmp call and then reading it back on return is
illegal. Use a separate local bailout variable instead.
This fixes the miscompile introduced by marking zend_bailout() as
noreturn.1 parent 3744533 commit 4f28bbd
1 file changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2597 | 2597 | | |
2598 | 2598 | | |
2599 | 2599 | | |
| 2600 | + | |
2600 | 2601 | | |
2601 | 2602 | | |
2602 | 2603 | | |
| |||
2763 | 2764 | | |
2764 | 2765 | | |
2765 | 2766 | | |
2766 | | - | |
| 2767 | + | |
2767 | 2768 | | |
2768 | 2769 | | |
2769 | 2770 | | |
| |||
2775 | 2776 | | |
2776 | 2777 | | |
2777 | 2778 | | |
2778 | | - | |
| 2779 | + | |
2779 | 2780 | | |
2780 | 2781 | | |
2781 | 2782 | | |
2782 | 2783 | | |
2783 | | - | |
2784 | 2784 | | |
2785 | 2785 | | |
2786 | 2786 | | |
| |||
0 commit comments