Zero-out fetch struct

Author: Girgias

ext/pdo/pdo_stmt.c

@@ -1595,14 +1595,13 @@ void pdo_stmt_free_default_fetch_mode(pdo_stmt_t *stmt)
 		if (stmt->fetch.into) {
 			OBJ_RELEASE(stmt->fetch.into);
 		}
-		stmt->fetch.into = NULL;
 	} else if (default_fetch_mode == PDO_FETCH_CLASS) {
 		if (stmt->fetch.cls.ctor_args != NULL) {
 			zend_hash_release(stmt->fetch.cls.ctor_args);
 		}
-		stmt->fetch.cls.ctor_args = NULL;
-		stmt->fetch.cls.ce = NULL;
 	}
+	/* Zero out fetch field */
+	memset(&stmt->fetch, 0, sizeof(stmt->fetch));
 }
 
 /* {{{ Changes the default fetch mode for subsequent fetches (params have different meaning for different fetch modes) */
@@ -1979,7 +1978,7 @@ static HashTable *dbstmt_get_gc(zend_object *object, zval **gc_data, int *gc_cou
 	zend_get_gc_buffer_add_zval(gc_buffer, &stmt->database_object_handle);
 	if (default_fetch_mode == PDO_FETCH_INTO) {
 		zend_get_gc_buffer_add_obj(gc_buffer, stmt->fetch.into);
-	} else if (default_fetch_mode == PDO_FETCH_CLASS) {
+	} else if (default_fetch_mode == PDO_FETCH_CLASS && stmt->fetch.cls.ctor_args != NULL) {
 		zend_get_gc_buffer_add_ht(gc_buffer, stmt->fetch.cls.ctor_args);
 	}
 	zend_get_gc_buffer_use(gc_buffer, gc_data, gc_count);