diff options
| author | Nikita Popov <nikic@php.net> | 2015-10-07 11:35:43 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-06-13 18:04:22 +0200 |
| commit | 1b29e0cacd4670d2f92456302bc5a3199b408a06 (patch) | |
| tree | aeb8147f93ff7ee6a478b5886ef1d86e3111286d /Zend/zend.h | |
| parent | 1cca3eb7c8e3623f60f3e5019ef29f2eca55ab5d (diff) | |
| download | php-git-1b29e0cacd4670d2f92456302bc5a3199b408a06.tar.gz | |
Switch zend_print_zval_r to use smart_str
Instead of directly writing to stdout. This allows doing a print_r
into a string, without using output buffering.
The motivation for this is bug #67467: print_r() in return mode
will still dump the string to stdout (causing a potential information
leak) if a fatal error occurs.
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index e886ba20d3..42130cadf8 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -39,6 +39,7 @@ #include "zend_variables.h" #include "zend_iterators.h" #include "zend_stream.h" +#include "zend_smart_str_public.h" #ifdef ZEND_SIGNALS # include "zend_signal.h" @@ -243,10 +244,9 @@ ZEND_API ZEND_COLD void _zend_bailout(char *filename, uint lineno); ZEND_API char *get_zend_version(void); ZEND_API int zend_make_printable_zval(zval *expr, zval *expr_copy); ZEND_API size_t zend_print_zval(zval *expr, int indent); -ZEND_API size_t zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent); ZEND_API void zend_print_zval_r(zval *expr, int indent); +ZEND_API zend_string *zend_print_zval_r_to_str(zval *expr, int indent); ZEND_API void zend_print_flat_zval_r(zval *expr); -ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent); ZEND_API ZEND_COLD void zend_output_debug_string(zend_bool trigger_break, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); ZEND_API void zend_activate(void); |