diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
| commit | 9ddf3c57805f0bb76a26cb31ba33e64c04d2133c (patch) | |
| tree | 15b04b41c0ebbbc4d94ae96e1929410f657817e1 /ext/pcre | |
| parent | 5de7115679522dec2f4725104c6f8c6e4a7bd8e4 (diff) | |
| parent | 43b03c74b322d6ceb003a14a7561fdffc4e13072 (diff) | |
| download | php-git-9ddf3c57805f0bb76a26cb31ba33e64c04d2133c.tar.gz | |
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/php_pcre.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index a8976eeede..473a189ce6 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -906,7 +906,7 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject, if ('\\' == *walk || '$' == *walk) { smart_str_appendl(&code, segment, walk - segment); if (walk_last == '\\') { - code.c[code.len-1] = *walk++; + code.s->val[code.s->len-1] = *walk++; segment = walk; walk_last = 0; continue; @@ -946,9 +946,9 @@ 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_stringl(code.c, code.len, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { + if (zend_eval_stringl(code.s->val, code.s->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); + php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code: %s%s", PHP_EOL, code.s->val); /* zend_error() does not return in this case */ } efree(compiled_string_description); |