device: Reorder finalization so that user data is destroyed last.

As the user is likely to attach the underlying resources to the device
for automatic collection upon finalization, it is important that the
user data is then destroy last (so that those resources are still
available in the surface and device cleanup routines).

1 files changed, 7 insertions, 2 deletions

diff --git a/src/cairo-device.c b/src/cairo-device.c
index 1e5bf0f1..f8a499e3 100644
--- a/src/cairo-device.c
+++ b/src/cairo-device.c
@@ -182,6 +182,8 @@ slim_hidden_def (cairo_device_finish);
 void
 cairo_device_destroy (cairo_device_t *device)
 {
+    cairo_user_data_array_t user_data;
+
     if (device == NULL ||
 	CAIRO_REFERENCE_COUNT_IS_INVALID (&device->ref_count))
     {
@@ -194,12 +196,15 @@ cairo_device_destroy (cairo_device_t *device)
 
     cairo_device_finish (device);
 
-    _cairo_user_data_array_fini (&device->user_data);
-
     assert (device->mutex_depth == 0);
     CAIRO_MUTEX_FINI (device->mutex);
 
+    user_data = device->user_data;
+
     device->backend->destroy (device);
+
+    _cairo_user_data_array_fini (&user_data);
+
 }
 slim_hidden_def (cairo_device_destroy);