From a7a8b7aefc8cb03fe8b716bee06b3449a7dba85f Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Tue, 11 Jun 2013 15:57:38 +0100 Subject: Fix freeing an atlas texture that hasn't been allocated The free function for atlas textures was previously always assuming that there will be a valid sub_texture pointer but this might not be the case if the texture was never successfully allocated. This was causing Cogl to crash if the application tries to make a texture that can not fit in the atlas using the automagic texture API. Reviewed-by: Robert Bragg --- tests/conform/test-conform-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c index 4d86c087..83a631e8 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -143,7 +143,7 @@ main (int argc, char **argv) ADD_TEST (test_fence, TEST_REQUIREMENT_FENCE, 0); - ADD_TEST (test_texture_no_allocate, 0, TEST_KNOWN_FAILURE); + ADD_TEST (test_texture_no_allocate, 0, 0); g_printerr ("Unknown test name \"%s\"\n", argv[1]); -- cgit v1.2.1