Mercurial > sdl-ios-xcode
annotate src/video/bwindow/SDL_BView.h @ 4158:96ce26f24b01 SDL-1.2
Date: Sun, 7 Sep 2008 15:17:00 +0200
From: c2woody@gmx.net
Subject: [SDL] SDL 1.2 doube free/pointer zeroing missing
Hello,
this is about a crash/debug breakage for the current SDL 1.2
source tree (today's svn checkout, same problem in 1.2.13 and
before as far as relevant).
In some places memory is free()d but the associated pointer
is not zeroed, leading to for example double free()s.
For me this happened because SDL_StopEventThread() was executed
twice (during restart of the subsystems), once for the close
down in SDL_VideoQuit() and once at the startup, right at the
beginning of SDL_StartEventLoop(). Thus the code
SDL_DestroyMutex(SDL_EventQ.lock);
(see SDL_events.c) was called twice and executed the SDL_free(mutex);
twice as well, leading to a crash (msvc 64bit for which it was noticed).
I've tried to check all other occurrences of SDL_free and similar
code in msvc, see the attached patch (udiff against revision 4082).
Non-windows only codepaths have neither been checked nor touched.
Comments/ideas welcome.
Attached patch: NULLifies some pointers after they have been free()d.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 12 Nov 2008 17:23:40 +0000 |
| parents | 4e29535b821b |
| children | a1b03ba2fcd0 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
114
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
24 #ifndef _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
25 #define _SDL_BView_h |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
26 |
| 0 | 27 /* This is the event handling and graphics update portion of SDL_BWin */ |
| 28 | |
| 29 extern "C" { | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
30 #include "../../events/SDL_events_c.h" |
| 0 | 31 }; |
| 32 | |
| 33 class SDL_BView : public BView | |
| 34 { | |
| 35 public: | |
| 36 SDL_BView(BRect frame) : | |
| 37 BView(frame, "SDL View", B_FOLLOW_ALL_SIDES, | |
| 38 (B_WILL_DRAW|B_FRAME_EVENTS)) { | |
| 39 image = NULL; | |
| 4012 | 40 xoff = yoff = 0; |
| 0 | 41 SetViewColor(0,0,0,0); |
| 42 SetHighColor(0,0,0,0); | |
| 43 } | |
| 44 virtual ~SDL_BView() { | |
| 45 SetBitmap(NULL); | |
| 46 } | |
| 4012 | 47 /* Set drawing offsets for fullscreen mode */ |
| 48 virtual void SetXYOffset(int x, int y) { | |
| 49 xoff = x; | |
| 50 yoff = y; | |
| 51 } | |
| 52 virtual void GetXYOffset(int &x, int &y) { | |
| 53 x = xoff; | |
| 54 y = yoff; | |
| 55 } | |
| 56 virtual void GetXYOffset(float &x, float &y) { | |
| 57 x = (float)xoff; | |
| 58 y = (float)yoff; | |
| 59 } | |
| 0 | 60 /* The view changed size. If it means we're in fullscreen, we |
| 61 * draw a nice black box in the entire view to get black borders. | |
| 62 */ | |
| 63 virtual void FrameResized(float width, float height) { | |
| 64 BRect bounds; | |
| 65 bounds.top = bounds.left = 0; | |
| 66 bounds.right = width; | |
| 67 bounds.bottom = height; | |
| 68 /* Fill the entire view with black */ | |
| 4012 | 69 FillRect(bounds, B_SOLID_HIGH); |
| 0 | 70 /* And if there's an image, redraw it. */ |
| 71 if( image ) { | |
| 72 bounds = image->Bounds(); | |
| 73 Draw(bounds); | |
| 74 } | |
| 75 } | |
| 4012 | 76 |
| 0 | 77 /* Drawing portion of this complete breakfast. :) */ |
| 78 virtual void SetBitmap(BBitmap *bitmap) { | |
| 79 if ( image ) { | |
| 80 delete image; | |
| 81 } | |
| 82 image = bitmap; | |
| 83 } | |
| 84 virtual void Draw(BRect updateRect) { | |
| 85 if ( image ) { | |
| 4012 | 86 if(xoff || yoff) { |
| 87 BRect dest; | |
| 88 dest.top = updateRect.top + yoff; | |
| 89 dest.left = updateRect.left + xoff; | |
| 90 dest.bottom = updateRect.bottom + yoff; | |
| 91 dest.right = updateRect.right + xoff; | |
| 92 DrawBitmap(image, updateRect, dest); | |
| 93 } else { | |
| 94 DrawBitmap(image, updateRect, updateRect); | |
| 95 } | |
| 0 | 96 } |
| 97 } | |
| 98 virtual void DrawAsync(BRect updateRect) { | |
| 4012 | 99 if(xoff || yoff) { |
| 100 BRect dest; | |
| 101 dest.top = updateRect.top + yoff; | |
| 102 dest.left = updateRect.left + xoff; | |
| 103 dest.bottom = updateRect.bottom + yoff; | |
| 104 dest.right = updateRect.right + xoff;; | |
| 105 DrawBitmapAsync(image, updateRect, dest); | |
| 106 } else { | |
| 0 | 107 DrawBitmapAsync(image, updateRect, updateRect); |
| 108 } | |
| 109 } | |
| 110 | |
| 111 private: | |
| 112 BBitmap *image; | |
| 4012 | 113 int xoff, yoff; |
| 0 | 114 }; |
|
756
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
115 |
|
10332c6fad2e
te: Mon, 15 Dec 2003 08:25:14 -0800 PST
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
116 #endif /* _SDL_BView_h */ |