From e9374032d6b5d4abfa3fe920e49e0a2c04b36ae9 Mon Sep 17 00:00:00 2001 From: Konstantin Kovshenin Date: Tue, 15 Oct 2024 21:40:11 +0100 Subject: [PATCH] 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. --- agent/php_mysqli.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/agent/php_mysqli.c b/agent/php_mysqli.c index 0f6d66920..a0fffbd83 100644 --- a/agent/php_mysqli.c +++ b/agent/php_mysqli.c @@ -434,7 +434,13 @@ static nr_status_t nr_php_mysqli_link_real_connect( ADD_IF_STR_SET(argv, argc, metadata->database); ADD_IF_INT_SET(argv, argc, metadata->port); ADD_IF_STR_SET(argv, argc, metadata->socket); - ADD_IF_INT_SET(argv, argc, metadata->flags); + + /* + * Avoid defaulting the final $flags argument to null. + */ + if (metadata->flags) { + ADD_IF_INT_SET(argv, argc, metadata->flags); + } } retval = nr_php_call_user_func(link, "real_connect", argc, argv TSRMLS_CC);