Mercurial > sdl-ios-xcode
view src/thread/symbian/SDL_syssem.cpp @ 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 | e85e65aec22f |
children | a1b03ba2fcd0 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ /* SDL_syssem.cpp Epoc version by Markus Mertama (w@iki.fi) */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id: SDL_syssem.c,v 1.1.2.4 2000/06/22 15:24:48 hercules Exp $"; #endif /* Semaphore functions using the Win32 API */ //#include <stdio.h> //#include <stdlib.h> #include <e32std.h> #include "SDL_error.h" #include "SDL_thread.h" #define SDL_MUTEX_TIMEOUT -2 struct SDL_semaphore { TInt handle; TInt count; }; extern TInt CreateUnique(TInt (*aFunc)(const TDesC& aName, TAny*, TAny*), TAny*, TAny*); #ifndef EKA2 extern TInt NewThread(const TDesC& aName, TAny* aPtr1, TAny* aPtr2); #endif TInt NewSema(const TDesC& aName, TAny* aPtr1, TAny* aPtr2) { TInt value = *((TInt*) aPtr2); return ((RSemaphore*)aPtr1)->CreateGlobal(aName, value); } /* Create a semaphore */ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) { RSemaphore s; TInt status = CreateUnique(NewSema, &s, &initial_value); if(status != KErrNone) { SDL_SetError("Couldn't create semaphore"); } SDL_semaphore* sem = new /*(ELeave)*/ SDL_semaphore; sem->handle = s.Handle(); sem->count = initial_value; return(sem); } /* Free the semaphore */ void SDL_DestroySemaphore(SDL_sem *sem) { if ( sem ) { RSemaphore sema; sema.SetHandle(sem->handle); while(--sem->count) sema.Signal(); sema.Close(); delete sem; sem = NULL; } } #ifndef EKA2 struct TInfo { TInfo(TInt aTime, TInt aHandle) : iTime(aTime), iHandle(aHandle), iVal(0) {} TInt iTime; TInt iHandle; TInt iVal; }; TBool ThreadRun(TAny* aInfo) { TInfo* info = STATIC_CAST(TInfo*, aInfo); User::After(info->iTime); RSemaphore sema; sema.SetHandle(info->iHandle); sema.Signal(); info->iVal = SDL_MUTEX_TIMEOUT; return 0; } #endif void _WaitAll(SDL_sem *sem) { //since SemTryWait may changed the counter. //this may not be atomic, but hopes it works. RSemaphore sema; sema.SetHandle(sem->handle); sema.Wait(); while(sem->count < 0) { sema.Wait(); } } int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } if ( timeout == SDL_MUTEX_MAXWAIT ) { _WaitAll(sem); return SDL_MUTEX_MAXWAIT; } #ifdef EKA2 RSemaphore sema; sema.SetHandle(sem->handle); if(KErrNone == sema.Wait(timeout)) return 0; return -1; #else RThread thread; TInfo* info = new (ELeave)TInfo(timeout, sem->handle); TInt status = CreateUnique(NewThread, &thread, info); if(status != KErrNone) return status; thread.Resume(); _WaitAll(sem); if(thread.ExitType() == EExitPending) { thread.Kill(SDL_MUTEX_TIMEOUT); } thread.Close(); return info->iVal; #endif } int SDL_SemTryWait(SDL_sem *sem) { if(sem->count > 0) { sem->count--; } return SDL_MUTEX_TIMEOUT; } int SDL_SemWait(SDL_sem *sem) { return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT); } /* Returns the current count of the semaphore */ Uint32 SDL_SemValue(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return 0; } return sem->count; } int SDL_SemPost(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } sem->count++; RSemaphore sema; sema.SetHandle(sem->handle); sema.Signal(); return 0; }