Date: Sun, 7 Sep 2008 15:17:00 +0200 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Wed, 12 Nov 2008 17:23:40 +0000
branchSDL-1.2
changeset 4158 96ce26f24b01
parent 4157 baf615f9f2a0
child 4159 a1b03ba2fcd0
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.
src/audio/SDL_wave.c
src/cdrom/win32/SDL_syscdrom.c
src/events/SDL_events.c
src/joystick/win32/SDL_mmjoystick.c
src/video/SDL_yuv_sw.c
src/video/windx5/SDL_dx5yuv.c
--- a/src/audio/SDL_wave.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/audio/SDL_wave.c	Wed Nov 12 17:23:40 2008 +0000
@@ -440,6 +440,7 @@
 	do {
 		if ( chunk.data != NULL ) {
 			SDL_free(chunk.data);
+			chunk.data = NULL;
 		}
 		lenread = ReadChunk(src, &chunk);
 		if ( lenread < 0 ) {
@@ -522,6 +523,7 @@
 	do {
 		if ( *audio_buf != NULL ) {
 			SDL_free(*audio_buf);
+			*audio_buf = NULL;
 		}
 		lenread = ReadChunk(src, &chunk);
 		if ( lenread < 0 ) {
@@ -591,6 +593,7 @@
 	if ( SDL_RWread(src, chunk->data, chunk->length, 1) != 1 ) {
 		SDL_Error(SDL_EFREAD);
 		SDL_free(chunk->data);
+		chunk->data = NULL;
 		return(-1);
 	}
 	return(chunk->length);
--- a/src/cdrom/win32/SDL_syscdrom.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/cdrom/win32/SDL_syscdrom.c	Wed Nov 12 17:23:40 2008 +0000
@@ -377,6 +377,7 @@
 	if ( SDL_numcds > 0 ) {
 		for ( i=0; i<SDL_numcds; ++i ) {
 			SDL_free(SDL_cdlist[i]);
+			SDL_cdlist[i] = NULL;
 		}
 		SDL_numcds = 0;
 	}
--- a/src/events/SDL_events.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/events/SDL_events.c	Wed Nov 12 17:23:40 2008 +0000
@@ -191,9 +191,11 @@
 		SDL_WaitThread(SDL_EventThread, NULL);
 		SDL_EventThread = NULL;
 		SDL_DestroyMutex(SDL_EventLock.lock);
+		SDL_EventLock.lock = NULL;
 	}
 #ifndef IPOD
 	SDL_DestroyMutex(SDL_EventQ.lock);
+	SDL_EventQ.lock = NULL;
 #endif
 }
 
--- a/src/joystick/win32/SDL_mmjoystick.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/joystick/win32/SDL_mmjoystick.c	Wed Nov 12 17:23:40 2008 +0000
@@ -344,6 +344,7 @@
 	if (joystick->hwdata != NULL) {
 		/* free system specific hardware data */
 		SDL_free(joystick->hwdata);
+		joystick->hwdata = NULL;
 	}
 }
 
@@ -354,6 +355,7 @@
 	for (i = 0; i < MAX_JOYSTICKS; i++) {
 		if ( SYS_JoystickName[i] != NULL ) {
 			SDL_free(SYS_JoystickName[i]);
+			SYS_JoystickName[i] = NULL;
 		}
 	}
 }
--- a/src/video/SDL_yuv_sw.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/video/SDL_yuv_sw.c	Wed Nov 12 17:23:40 2008 +0000
@@ -1294,5 +1294,6 @@
 			SDL_free(swdata->rgb_2_pix);
 		}
 		SDL_free(swdata);
+		overlay->hwdata = NULL;
 	}
 }
--- a/src/video/windx5/SDL_dx5yuv.c	Fri Nov 07 04:15:36 2008 +0000
+++ b/src/video/windx5/SDL_dx5yuv.c	Wed Nov 12 17:23:40 2008 +0000
@@ -290,6 +290,7 @@
 			IDirectDrawSurface_Release(hwdata->surface);
 		}
 		SDL_free(hwdata);
+		overlay->hwdata = NULL;
 	}
 }