fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 19:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dont call user data destroy function if it's NULL.

Browse source 
Add test case for user data with NULL destroy function.
This commit is contained in:
Kristian Høgsberg 2005-03-16 12:15:29 +00:00
parent 6993c086eb
commit 0f52fb2289
5 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,4 +1,13 @@
2005-03-16 Kristian Høgsberg <set EMAIL_ADDRESS environment variable>
2005-03-16 Kristian Høgsberg <krh@redhat.com>
* src/cairo_surface.c (_destroy_user_data)
(cairo_surface_set_user_data): Dont call user data destroy
function if it's NULL.
* test/user_data.c: (main): Add test case for user data with NULL
destroy function.
2005-03-16 Kristian Høgsberg <krh@redhat.com>
* src/Makefile.am: Add cairo_output_stream.c

4
src/cairo-surface.c
View file

@ -149,7 +149,7 @@ _destroy_user_data (cairo_surface_t *surface)
num_slots = surface->user_data_slots.num_elements;
slots = (cairo_user_data_slot_t *) surface->user_data_slots.elements;
for (i = 0; i < num_slots; i++) {
if (slots[i].user_data != NULL)
if (slots[i].user_data != NULL && slots[i].destroy != NULL)
slots[i].destroy (slots[i].user_data);
}
@ -267,7 +267,7 @@ cairo_surface_set_user_data (cairo_surface_t *surface,
slots = (cairo_user_data_slot_t *) surface->user_data_slots.elements;
for (i = 0; i < num_slots; i++) {
if (slots[i].key == key) {
if (slots[i].user_data != NULL)
if (slots[i].user_data != NULL && slots[i].destroy != NULL)
slots[i].destroy (slots[i].user_data);
s = &slots[i];
break;

4
src/cairo_surface.c
View file

@ -149,7 +149,7 @@ _destroy_user_data (cairo_surface_t *surface)
num_slots = surface->user_data_slots.num_elements;
slots = (cairo_user_data_slot_t *) surface->user_data_slots.elements;
for (i = 0; i < num_slots; i++) {
if (slots[i].user_data != NULL)
if (slots[i].user_data != NULL && slots[i].destroy != NULL)
slots[i].destroy (slots[i].user_data);
}
@ -267,7 +267,7 @@ cairo_surface_set_user_data (cairo_surface_t *surface,
slots = (cairo_user_data_slot_t *) surface->user_data_slots.elements;
for (i = 0; i < num_slots; i++) {
if (slots[i].key == key) {
if (slots[i].user_data != NULL)
if (slots[i].user_data != NULL && slots[i].destroy != NULL)
slots[i].destroy (slots[i].user_data);
s = &slots[i];
break;

8
test/user-data.c
View file

@ -56,10 +56,18 @@ main (void)
assert (cairo_surface_get_user_data (surface, &key1) == &data1);
assert (cairo_surface_set_user_data (surface, &key1, NULL, NULL)
== CAIRO_STATUS_SUCCESS);
assert (cairo_surface_get_user_data (surface, &key1) == NULL);
assert (data1 == 1);
assert (data2 == 0);
data1 = 0;
assert (cairo_surface_set_user_data (surface, &key1, &data1, NULL)
== CAIRO_STATUS_SUCCESS);
assert (cairo_surface_set_user_data (surface, &key1, NULL, NULL)
== CAIRO_STATUS_SUCCESS);
assert (data1 == 0);
assert (cairo_surface_get_user_data (surface, &key1) == NULL);
assert (cairo_surface_set_user_data (surface, &key1, &data1, destroy_data1)
== CAIRO_STATUS_SUCCESS);
cairo_surface_destroy (surface);

8
test/user_data.c
View file

@ -56,10 +56,18 @@ main (void)
assert (cairo_surface_get_user_data (surface, &key1) == &data1);
assert (cairo_surface_set_user_data (surface, &key1, NULL, NULL)
== CAIRO_STATUS_SUCCESS);
assert (cairo_surface_get_user_data (surface, &key1) == NULL);
assert (data1 == 1);
assert (data2 == 0);
data1 = 0;
assert (cairo_surface_set_user_data (surface, &key1, &data1, NULL)
== CAIRO_STATUS_SUCCESS);
assert (cairo_surface_set_user_data (surface, &key1, NULL, NULL)
== CAIRO_STATUS_SUCCESS);
assert (data1 == 0);
assert (cairo_surface_get_user_data (surface, &key1) == NULL);
assert (cairo_surface_set_user_data (surface, &key1, &data1, destroy_data1)
== CAIRO_STATUS_SUCCESS);
cairo_surface_destroy (surface);