diff options
| author | Matt Wilmas <mattwil@php.net> | 2009-06-05 18:50:32 +0000 |
|---|---|---|
| committer | Matt Wilmas <mattwil@php.net> | 2009-06-05 18:50:32 +0000 |
| commit | d55300298e0e3ec0bdbb58ff3dcfda113d21852e (patch) | |
| tree | f8efe461ea2aab77c8d712d7954c09fc481095b6 /ext | |
| parent | a80be6827dd734ddb33dbf8b177a3d70a20cd9b5 (diff) | |
| download | php-git-d55300298e0e3ec0bdbb58ff3dcfda113d21852e.tar.gz | |
MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/interbase/php_ibase_udf.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 4 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 | ||||
| -rw-r--r-- | ext/standard/assert.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c index 31ca1e38f9..ef2bc6c4fd 100644 --- a/ext/interbase/php_ibase_udf.c +++ b/ext/interbase/php_ibase_udf.c @@ -165,7 +165,7 @@ void exec_php(BLOBCALLBACK b, PARAMDSC *res, ISC_SHORT *init) #endif /* feed it to the parser */ zend_first_try { - result = zend_eval_string(code, NULL, "Firebird Embedded PHP engine" TSRMLS_CC); + result = zend_eval_stringl(code, b->blob_total_length, NULL, "Firebird Embedded PHP engine" TSRMLS_CC); } zend_end_try(); } diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 8adf7549d0..40e89ae1d6 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -914,9 +914,9 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, OnigOp if (eval) { zval v; /* null terminate buffer */ - smart_str_appendc(&eval_buf, '\0'); + smart_str_0(&eval_buf); /* do eval */ - if (zend_eval_string(eval_buf.c, &v, description TSRMLS_CC) == FAILURE) { + if (zend_eval_stringl(eval_buf.c, eval_buf.len, &v, description TSRMLS_CC) == FAILURE) { efree(description); php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code: %s%s", PHP_EOL, eval_buf.c); /* zend_error() does not return in this case */ diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 7d414a3858..49161f2edf 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -913,7 +913,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject, compiled_string_description = zend_make_compiled_string_description("regexp code" TSRMLS_CC); /* Run the code */ - if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { + if (zend_eval_stringl(code.c, code.len, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code: %s%s", PHP_EOL, code.c); /* zend_error() does not return in this case */ diff --git a/ext/standard/assert.c b/ext/standard/assert.c index e1767d499b..47bdcedd97 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -164,7 +164,7 @@ PHP_FUNCTION(assert) } compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); - if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { + if (zend_eval_stringl(myeval, Z_STRLEN_PP(assertion), &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Failure evaluating code: %s%s", PHP_EOL, myeval); if (ASSERTG(bail)) { |