Skip to content

Commit 55383f0

Browse files
committed
fix(agent): use zend_eval_stringl
1 parent 54f720d commit 55383f0

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

agent/lib_php_amqplib.c

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ static void nr_php_amqplib_ensure_class() {
9494

9595
class_entry = nr_php_find_class("phpamqplib\\channel\\amqpchannel");
9696
if (NULL == class_entry) {
97-
result = zend_eval_string(
98-
"class_exists('PhpAmqpLib\\Channel\\AMQPChannel');", NULL,
97+
result = zend_eval_stringl(
98+
NR_PSTR("class_exists('PhpAmqpLib\\Channel\\AMQPChannel');"), NULL,
9999
"nr_php_amqplib_class_exists_channel_amqpchannel");
100100
}
101101
/*
@@ -119,15 +119,16 @@ void nr_php_amqplib_handle_version() {
119119
zval retval_zpd;
120120
int result = FAILURE;
121121

122-
result = zend_eval_string(
123-
"(function() {"
124-
" $nr_php_amqplib_version = null;"
125-
" try {"
126-
" $nr_php_amqplib_version = PhpAmqpLib\\Package::VERSION;"
127-
" } catch (Throwable $e) {"
128-
" }"
129-
" return $nr_php_amqplib_version;"
130-
"})();",
122+
result = zend_eval_stringl(
123+
NR_PSTR(
124+
"(function() {"
125+
" $nr_php_amqplib_version = null;"
126+
" try {"
127+
" $nr_php_amqplib_version = PhpAmqpLib\\Package::VERSION;"
128+
" } catch (Throwable $e) {"
129+
" }"
130+
" return $nr_php_amqplib_version;"
131+
"})();"),
131132
&retval_zpd, "nr_php_amqplib_get_phpamqplib_package_version");
132133

133134
/* See if we got a non-empty/non-null string for version. */
@@ -298,14 +299,14 @@ static inline void nr_php_amqplib_insert_dt_headers(zval* amqp_msg) {
298299
* create it with an empty array.
299300
*/
300301
if (!nr_php_is_zval_valid_object(amqp_headers_table)) {
301-
retval = zend_eval_string(
302-
"(function() {"
303-
" try {"
304-
" return new PhpAmqpLib\\Wire\\AMQPTable(array());"
305-
" } catch (Throwable $e) {"
306-
" return null;"
307-
" }"
308-
"})();",
302+
retval = zend_eval_stringl(
303+
NR_PSTR("(function() {"
304+
" try {"
305+
" return new PhpAmqpLib\\Wire\\AMQPTable(array());"
306+
" } catch (Throwable $e) {"
307+
" return null;"
308+
" }"
309+
"})();"),
309310
&amqp_table_retval_zpd, "nr_php_amqplib_create_empty_amqptable");
310311

311312
if (FAILURE == retval) {

0 commit comments

Comments
 (0)