Mercurial > sdl-ios-xcode
annotate src/audio/SDL_wave.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 | b8d311d90021 |
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:
722
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 | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
22 | |
23 #ifdef SAVE_RCSID | |
24 static char rcsid = | |
25 "@(#) $Id$"; | |
26 #endif | |
27 | |
28 /* WAVE files are little-endian */ | |
29 | |
30 /*******************************************/ | |
31 /* Define values for Microsoft WAVE format */ | |
32 /*******************************************/ | |
33 #define RIFF 0x46464952 /* "RIFF" */ | |
34 #define WAVE 0x45564157 /* "WAVE" */ | |
35 #define FACT 0x74636166 /* "fact" */ | |
36 #define LIST 0x5453494c /* "LIST" */ | |
37 #define FMT 0x20746D66 /* "fmt " */ | |
38 #define DATA 0x61746164 /* "data" */ | |
39 #define PCM_CODE 0x0001 | |
40 #define MS_ADPCM_CODE 0x0002 | |
41 #define IMA_ADPCM_CODE 0x0011 | |
42 #define WAVE_MONO 1 | |
43 #define WAVE_STEREO 2 | |
44 | |
45 /* Normally, these three chunks come consecutively in a WAVE file */ | |
46 typedef struct WaveFMT { | |
47 /* Not saved in the chunk we read: | |
48 Uint32 FMTchunk; | |
49 Uint32 fmtlen; | |
50 */ | |
51 Uint16 encoding; | |
52 Uint16 channels; /* 1 = mono, 2 = stereo */ | |
53 Uint32 frequency; /* One of 11025, 22050, or 44100 Hz */ | |
54 Uint32 byterate; /* Average bytes per second */ | |
55 Uint16 blockalign; /* Bytes per sample block */ | |
56 Uint16 bitspersample; /* One of 8, 12, 16, or 4 for ADPCM */ | |
57 } WaveFMT; | |
58 | |
59 /* The general chunk found in the WAVE file */ | |
60 typedef struct Chunk { | |
61 Uint32 magic; | |
62 Uint32 length; | |
722
90dfd3f5782c
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
63 Uint8 *data; |
0 | 64 } Chunk; |
65 |