]> granicus.if.org Git - php/commitdiff
Fixed resources apply_dtor
authorXinchen Hui <laruence@php.net>
Mon, 19 May 2014 06:53:02 +0000 (14:53 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 19 May 2014 06:53:02 +0000 (14:53 +0800)
ext/pgsql/pgsql.c
main/streams/streams.c

index f215993bf6f77dbd825a19163fdfa0012fbee733..be1f31cc6f1c311696d618b3f1511079ada69c44 100644 (file)
@@ -989,11 +989,12 @@ static void _php_pgsql_notice_ptr_dtor(zval *el)
 
 /* {{{ _rollback_transactions
  */
-static int _rollback_transactions(zend_resource *rsrc TSRMLS_DC)
+static int _rollback_transactions(zval *el TSRMLS_DC)
 {
        PGconn *link;
        PGresult *res;
        int orig;
+       zend_resource *rsrc = Z_RES_P(el);
 
        if (rsrc->type != le_plink) 
                return 0;
index 0889bd57a76eb18d9e8a12eddf0b8ea173c01649..c754bdc58cb3dbab054fe4c949d61d7f457bfb19 100644 (file)
@@ -74,9 +74,10 @@ static int _php_stream_release_context(zval *zv, void *pContext TSRMLS_DC)
        return 0;
 }
 
-static int forget_persistent_resource_id_numbers(zend_resource *rsrc TSRMLS_DC)
+static int forget_persistent_resource_id_numbers(zval *el TSRMLS_DC)
 {
        php_stream *stream;
+       zend_resource *rsrc = Z_RES_P(el);
 
        if (rsrc->type != le_pstream) {
                return 0;