Updated calls to php_trim() to provide arg for returned string type

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 8fa9e0ac3b7b379ac0402b9e382e3a4424bb81ea..ba6859f8511325de8fb15f0fdbaf1675bf7a4c72 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -337,7 +337,7 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
                        trim_zv = *member;
                        zval_copy_ctor(&trim_zv);
                        convert_to_string(&trim_zv);
-                       php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, &tmp_zv, 3 TSRMLS_CC);
+                       php_trim(Z_STRVAL(trim_zv), Z_STRLEN(trim_zv), NULL, 0, IS_STRING, &tmp_zv, 3 TSRMLS_CC);
                        zval_dtor(&trim_zv);
                        member = &tmp_zv;
                }

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 7ac21750d682961aa751d1819b298b24a035bbf7..5a0cd27cf4f662a584b9212d731f8851cf5584c1 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -265,7 +265,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                Z_STRLEN_PP(tmpzval)) {
                /* Remove newlines and spaces from start and end,
                   php_trim will estrndup() */
-               tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), NULL, 0, NULL, 3 TSRMLS_CC);
+               tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval), NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC);
                if (strlen(tmp) > 0) {
                        if (!header_init) { /* Remove post headers for redirects */
                                int l = strlen(tmp);
@@ -291,7 +291,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                                        }
                                }
                                efree(tmp_c);
-                               tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, NULL, 3 TSRMLS_CC);
+                               tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC);
                                efree(tmp);
                                tmp = tmp_c;
                        }