Skip to content

Commit e9099ac

Browse files
kovsheninlavarou
authored andcommitted
Avoid defaulting the final $flags argument to null
The correct default for the $flags argument is 0, not null. Passing a null causes a warning.
1 parent a1e0693 commit e9099ac

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

agent/php_mysqli.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,13 @@ static nr_status_t nr_php_mysqli_link_real_connect(
434434
ADD_IF_STR_SET(argv, argc, metadata->database);
435435
ADD_IF_INT_SET(argv, argc, metadata->port);
436436
ADD_IF_STR_SET(argv, argc, metadata->socket);
437-
ADD_IF_INT_SET(argv, argc, metadata->flags);
437+
438+
/*
439+
* Avoid defaulting the final $flags argument to null.
440+
*/
441+
if (metadata->flags) {
442+
ADD_IF_INT_SET(argv, argc, metadata->flags);
443+
}
438444
}
439445

440446
retval = nr_php_call_user_func(link, "real_connect", argc, argv TSRMLS_CC);

0 commit comments

Comments
 (0)