Mercurial > sdl-ios-xcode
annotate include/SDL_main.h @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Sat, 19 Nov 2005 18:57:00 +0000 |
parents | d31afac94eff |
children | c9b51268668f |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
453
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
0 | 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 | |
251
b8688cfdc232
Updated the headers with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
173
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 #ifdef SAVE_RCSID | |
24 static char rcsid = | |
25 "@(#) $Id$"; | |
26 #endif | |
27 | |
28 #ifndef _SDL_main_h | |
29 #define _SDL_main_h | |
30 | |
31 /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ | |
32 | |
453
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
33 #if defined(WIN32) || defined(_WIN32) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
34 (defined(__MWERKS__) && !defined(__BEOS__)) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
35 defined(macintosh) || defined(__APPLE__) || \ |
a6fa62b1be09
Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents:
371
diff
changeset
|
36 defined(__SYMBIAN32__) || defined(QWS) |
0 | 37 |
38 #ifdef __cplusplus | |
39 #define C_LINKAGE "C" | |
40 #else | |
41 #define C_LINKAGE | |
42 #endif /* __cplusplus */ | |
43 | |
44 /* The application's main() function must be called with C linkage, | |
45 and should be declared like this: | |
46 #ifdef __cplusplus | |
47 extern "C" | |
48 #endif | |
49 int main(int argc, char *argv[]) | |
50 { | |
51 } | |
52 */ | |
53 #define main SDL_main | |
54 | |
55 /* The prototype for the application's main() function */ | |
56 extern C_LINKAGE int SDL_main(int argc, char *argv[]); | |
57 | |
58 | |
59 /* From the SDL library code -- needed for registering the app on Win32 */ | |
60 #if defined(WIN32) | |
61 #include "SDL_types.h" | |
62 #include "begin_code.h" | |
63 | |
64 #ifdef __cplusplus | |
65 extern "C" { | |
66 #endif | |
67 | |
68 /* This should be called from your WinMain() function, if any */ | |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
69 extern DECLSPEC void SDLCALL SDL_SetModuleHandle(void *hInst); |
145
29a638dc26db
Applied David MacCormack's patch to fix SDL_WINDOWID on Windows,
Sam Lantinga <slouken@libsdl.org>
parents:
47
diff
changeset
|
70 /* This can also be called, but is no longer necessary */ |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
71 extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst); |
1145
d31afac94eff
Patch from Martin Lange (mala-sdl at hotmail.com) to unregister SDL's win32
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
72 /* This can also be called, but is no longer necessary (SDL_Quit calls it) */ |
d31afac94eff
Patch from Martin Lange (mala-sdl at hotmail.com) to unregister SDL's win32
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
73 extern DECLSPEC void SDLCALL SDL_UnregisterApp(); |
0 | 74 #ifdef __cplusplus |
75 } | |
76 #endif | |
77 #include "close_code.h" | |
78 #endif | |
79 | |
80 /* From the SDL library code -- needed for registering QuickDraw on MacOS */ | |
81 #if defined(macintosh) | |
82 #include "begin_code.h" | |
83 | |
84 #ifdef __cplusplus | |
85 extern "C" { | |
86 #endif | |
87 | |
88 /* Forward declaration so we don't need to include QuickDraw.h */ | |
89 struct QDGlobals; | |
90 | |
91 /* This should be called from your main() function, if any */ | |
337
9154ec9ca3d2
Explicitly specify the SDL API calling convention (C by default)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
92 extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd); |
0 | 93 |
94 #ifdef __cplusplus | |
95 } | |
96 #endif | |
97 #include "close_code.h" | |
98 #endif | |
99 | |
100 #endif /* Need to redefine main()? */ | |
101 | |
102 #endif /* _SDL_main_h */ |