We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Mark destroyed windows with NULL and check for it in the tests.

sdl2_null_the_pointer_on_window_destruction.diff (text/plain), 5.20 KB, created by norfanin on 2013-10-03 21:02:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: norfanin

Created: 2013-10-03 21:02:05 UTC

Size: 5.20 KB

patch

obsolete

>diff -r d5489cec371b src/test/SDL_test_common.c
>--- a/src/test/SDL_test_common.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/src/test/SDL_test_common.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -1200,6 +1200,12 @@
>                 SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
>                 if (window) {
>                     SDL_DestroyWindow(window);
>+                    for (i = 0; i < state->num_windows; ++i) {
>+                        if (window == state->windows[i]) {
>+                            state->windows[i] = NULL;
>+                            break;
>+                        }
>+                    }
>                 }
>             }
>             break;
>diff -r d5489cec371b test/testdraw2.c
>--- a/test/testdraw2.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testdraw2.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -253,6 +253,8 @@
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>             SDL_Renderer *renderer = state->renderers[i];
>+            if (state->windows[i] == NULL)
>+                continue;
>             SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
>             SDL_RenderClear(renderer);
> 
>diff -r d5489cec371b test/testgl2.c
>--- a/test/testgl2.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testgl2.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -340,6 +340,8 @@
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>             int w, h;
>+            if (state->windows[i] == NULL)
>+                continue;
>             SDL_GL_MakeCurrent(state->windows[i], context);
>             SDL_GL_GetDrawableSize(state->windows[i], &w, &h);
>             glViewport(0, 0, w, h);
>diff -r d5489cec371b test/testgles.c
>--- a/test/testgles.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testgles.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -312,6 +312,8 @@
>             SDLTest_CommonEvent(state, &event, &done);
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>+            if (state->windows[i] == NULL)
>+                continue;
>             status = SDL_GL_MakeCurrent(state->windows[i], context[i]);
>             if (status) {
>                 SDL_Log("SDL_GL_MakeCurrent(): %s\n", SDL_GetError());
>diff -r d5489cec371b test/testime.c
>--- a/test/testime.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testime.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -196,6 +196,8 @@
>     int i;
>     for (i = 0; i < state->num_windows; ++i) {
>         SDL_Renderer *renderer = state->renderers[i];
>+        if (state->windows[i] == NULL)
>+            continue;
>         SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
>         SDL_RenderClear(renderer);
> 
>diff -r d5489cec371b test/testintersections.c
>--- a/test/testintersections.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testintersections.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -310,6 +310,8 @@
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>             SDL_Renderer *renderer = state->renderers[i];
>+            if (state->windows[i] == NULL)
>+                continue;
>             SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
>             SDL_RenderClear(renderer);
> 
>diff -r d5489cec371b test/testrelative.c
>--- a/test/testrelative.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testrelative.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -84,6 +84,8 @@
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>             SDL_Renderer *renderer = state->renderers[i];
>+            if (state->windows[i] == NULL)
>+                continue;
>             SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
>             SDL_RenderClear(renderer);
> 
>diff -r d5489cec371b test/testrendercopyex.c
>--- a/test/testrendercopyex.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testrendercopyex.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -188,6 +188,8 @@
>             SDLTest_CommonEvent(state, &event, &done);
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>+            if (state->windows[i] == NULL)
>+                continue;
>             Draw(&drawstates[i]);
>         }
>     }
>diff -r d5489cec371b test/testrendertarget.c
>--- a/test/testrendertarget.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testrendertarget.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -279,6 +279,8 @@
>             SDLTest_CommonEvent(state, &event, &done);
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>+            if (state->windows[i] == NULL)
>+                continue;
>             if (test_composite) {
>                 DrawComposite(&drawstates[i]);
>             } else {
>diff -r d5489cec371b test/testscale.c
>--- a/test/testscale.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testscale.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -178,6 +178,8 @@
>             SDLTest_CommonEvent(state, &event, &done);
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>+            if (state->windows[i] == NULL)
>+                continue;
>             Draw(&drawstates[i]);
>         }
>     }
>diff -r d5489cec371b test/testsprite2.c
>--- a/test/testsprite2.c	Thu Oct 03 03:31:05 2013 -0700
>+++ b/test/testsprite2.c	Thu Oct 03 22:43:35 2013 +0200
>@@ -360,6 +360,8 @@
>             SDLTest_CommonEvent(state, &event, &done);
>         }
>         for (i = 0; i < state->num_windows; ++i) {
>+            if (state->windows[i] == NULL)
>+                continue;
>             MoveSprites(state->renderers[i], sprites[i]);
>         }
>     }

Actions: View | Diff

Attachments on bug 2132: 1355

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.