diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:10:02 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-28 20:10:02 +0300 |
| commit | 83804519dffcbb23ef689b37816ee28f2c3192e0 (patch) | |
| tree | 52b774b523002e442a938cefed6476e63188405e /ext/pdo | |
| parent | 071b389bc6da9c6dc33e798806a0da63fc1cedf6 (diff) | |
| download | php-git-83804519dffcbb23ef689b37816ee28f2c3192e0.tar.gz | |
Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/pdo_dbh.c | 2 | ||||
| -rw-r--r-- | ext/pdo/pdo_stmt.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 160be18387..aa0edbbb47 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -1108,7 +1108,7 @@ static PHP_METHOD(PDO, query) } /* something broke */ dbh->query_stmt = stmt; - ZVAL_COPY_VALUE(&dbh->query_stmt_zval, return_value); + ZVAL_OBJ(&dbh->query_stmt_zval, Z_OBJ_P(return_value)); Z_DELREF(stmt->database_object_handle); ZVAL_UNDEF(&stmt->database_object_handle); PDO_HANDLE_STMT_ERR(); diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 25dd33bfdf..92e594c76b 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -2418,7 +2418,8 @@ zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object, int I = ecalloc(1, sizeof(struct php_pdo_iterator)); zend_iterator_init(&I->iter); I->iter.funcs = &pdo_stmt_iter_funcs; - ZVAL_COPY(&I->iter.data, object); + Z_ADDREF_P(object); + ZVAL_OBJ(&I->iter.data, Z_OBJ_P(object)); if (!do_fetch(stmt, 1, &I->fetch_ahead, PDO_FETCH_USE_DEFAULT, PDO_FETCH_ORI_NEXT, 0, 0)) { |