Skip to content

Commit 31f3b78

Browse files
committed
Possible missing braces compiler warning fix for PDO
1 parent 0202979 commit 31f3b78

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Zend/zend_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ typedef union _zend_value {
302302
struct _zval_struct {
303303
zend_value value; /* value */
304304
union {
305+
uint32_t type_info;
305306
struct {
306307
ZEND_ENDIAN_LOHI_3(
307308
zend_uchar type, /* active type */
@@ -310,7 +311,6 @@ struct _zval_struct {
310311
uint16_t extra; /* not further specified */
311312
} u)
312313
} v;
313-
uint32_t type_info;
314314
} u1;
315315
union {
316316
uint32_t next; /* hash collision chain */

ext/pdo/pdo_stmt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
750750
{
751751
int flags, idx, old_arg_count = 0;
752752
zend_class_entry *ce = NULL, *old_ce = NULL;
753-
zval grp_val, *pgrp, retval, old_ctor_args = {0};
753+
zval grp_val, *pgrp, retval, old_ctor_args = {{0}, {0}, {0}};
754754
int colno;
755755

756756
if (how == PDO_FETCH_USE_DEFAULT) {

0 commit comments

Comments
 (0)