diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-15 11:35:13 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-15 11:35:13 +0200 |
| commit | 7f6c22cb3d207db0937a8f67e51bee031ba47314 (patch) | |
| tree | 1433e583f322bc6ab0d67f6cf4809afd74928b73 /ext | |
| parent | 908660c1d778186f661d97c7051c8f2891e2e602 (diff) | |
| download | php-git-7f6c22cb3d207db0937a8f67e51bee031ba47314.tar.gz | |
Fix last maybe uninit warnings on 7.4
Most of these only occur under GCC 5. Not fond of all the workarounds
(especially the PDO one), but it gets us a clean build...
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 6 | ||||
| -rw-r--r-- | ext/sockets/conversions.c | 3 | ||||
| -rw-r--r-- | ext/standard/php_fopen_wrapper.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 98d9d2dd68..25dd33bfdf 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -819,7 +819,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_ { int flags, idx, old_arg_count = 0; zend_class_entry *ce = NULL, *old_ce = NULL; - zval grp_val, *pgrp, retval, old_ctor_args; + zval grp_val, *pgrp, retval, old_ctor_args = {0}; int colno; if (how == PDO_FETCH_USE_DEFAULT) { diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index b7eaf90de6..e8ba1f505a 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1016,6 +1016,7 @@ static int sxe_prop_is_empty(zval *object) /* {{{ */ zval iter_data; int test; int is_empty; + int use_iter = 0; sxe = Z_SXEOBJ_P(object); @@ -1052,6 +1053,7 @@ static int sxe_prop_is_empty(zval *object) /* {{{ */ ZVAL_COPY_VALUE(&iter_data, &sxe->iter.data); ZVAL_UNDEF(&sxe->iter.data); node = php_sxe_reset_iterator(sxe, 0); + use_iter = 1; } } @@ -1080,7 +1082,7 @@ static int sxe_prop_is_empty(zval *object) /* {{{ */ is_empty = 0; break; next_iter: - if (!Z_ISUNDEF(iter_data)) { + if (use_iter) { node = php_sxe_iterator_fetch(sxe, node->next, 0); } else { node = node->next; @@ -1088,7 +1090,7 @@ next_iter: } } - if (!Z_ISUNDEF(iter_data)) { + if (use_iter) { if (!Z_ISUNDEF(sxe->iter.data)) { zval_ptr_dtor(&sxe->iter.data); } diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c index 6eede2b20a..a9f287a8ea 100644 --- a/ext/sockets/conversions.c +++ b/ext/sockets/conversions.c @@ -701,6 +701,9 @@ static void from_zval_write_sockaddr_aux(const zval *container, zval *elem; int fill_sockaddr; + *sockaddr_ptr = NULL; + *sockaddr_len = 0; + if (Z_TYPE_P(container) != IS_ARRAY) { do_from_zval_err(ctx, "%s", "expected an array here"); return; diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 36fe523d92..053f8417ec 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -181,7 +181,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa int fd = -1; int mode_rw = 0; php_stream * stream = NULL; - char *p, *token, *pathdup; + char *p, *token = NULL, *pathdup; zend_long max_memory; FILE *file = NULL; #ifdef PHP_WIN32 |