Mercurial > sdl-ios-xcode
annotate src/video/os2fslib/SDL_os2fslib.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 | e3242177fe4a |
children | 782fd950bd46 c121d94672cb a1b03ba2fcd0 |
rev | line source |
---|---|
1190 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga | |
4 | |
5 This library is free software; you can redistribute it and/or | |
6 modify it under the terms of the GNU Library General Public | |
7 License as published by the Free Software Foundation; either | |
8 version 2 of the License, or (at your option) any later version. | |
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 | |
13 Library General Public License for more details. | |
14 | |
15 You should have received a copy of the GNU Library General Public | |
16 License along with this library; if not, write to the Free | |
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | |
19 Sam Lantinga | |
20 slouken@libsdl.org | |
21 */ | |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1190
diff
changeset
|
22 #include "SDL_config.h" |
1190 | 23 |
24 #ifndef _SDL_os2fslib_h | |
25 #define _SDL_os2fslib_h | |
26 | |
27 | |
28 // OS2 specific includes | |
29 #define INCL_TYPES | |
30 #define INCL_DOS | |
31 #define INCL_DOSERRORS | |
32 #define INCL_DOSPROCESS | |
33 #define INCL_WIN | |
34 #define INCL_GPI | |
35 #include <os2.h> | |
36 | |
37 #include <FSLib.h> | |
38 | |
39 /* Hidden "this" pointer for the video functions */ | |
40 #define _THIS SDL_VideoDevice *_this | |
41 | |
42 /* Private display data */ | |
43 struct SDL_PrivateVideoData | |
44 { | |
45 FSLib_VideoMode_p pAvailableFSLibVideoModes; | |
46 SDL_Rect **pListModesResult; // Allocated memory to return list of modes for os2fslib_ListModes() API | |
47 | |
48 FSLib_VideoMode SrcBufferDesc; // Description of current source image buffer | |
49 char *pchSrcBuffer; // The source image buffer itself | |
50 SDL_Surface *pSDLSurface; // The SDL surface describing the buffer | |
51 HMTX hmtxUseSrcBuffer; // Mutex semaphore to manipulate src buffer | |
52 HWND hwndFrame, hwndClient; // Window handle of frame and client | |
53 int iPMThreadStatus; // 0: Not running | |
54 // 1: Running | |
55 // Other: Not running, had an error | |
56 int tidPMThread; // Thread ID of PM Thread | |
57 int fInFocus; // True if we're in focus! | |
58 int iSkipWMMOUSEMOVE; // Number of WM_MOUSEMOVE messages to skip! | |
59 int iMouseVisible; // | |
1442
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
60 |
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
61 PFNWP pfnOldFrameProc; // Old window frame procedure |
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
62 int bProportionalResize; // 0: No proportional resizing |
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
63 // 1: Do proportional resizing |
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
64 ULONG ulResizingFlag; // First resizing flag value |
1190 | 65 }; |
66 | |
1442
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
67 /* OS/2 specific backdoor function to be able to set FrameControlFlags of */ |
e3242177fe4a
Updated OS/2 build, yay!
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
68 /* the SDL window before creating it. */ |
1190 | 69 extern DECLSPEC void SDLCALL SDL_OS2FSLIB_SetFCFToUse(ULONG ulFCF); |
70 | |
71 #endif /* _SDL_os2fslib_h */ |