pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401576
This commit is contained in:
Sam Lantinga 2006-03-21 16:04:44 +00:00
parent 1b970c313e
commit c21749e945
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/macosx/SDLMain.m
View file

@ -252,19 +252,20 @@ static void CustomApplicationMain (int argc, char **argv)
return FALSE;
const char *temparg = [filename UTF8String];
char *arg = (char *) malloc(strlen(temparg) + 1);
size_t arglen = SDL_strlen(temparg) + 1;
char *arg = (char *) SDL_malloc(arglen);
if (arg == NULL)
return FALSE;
char **newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
if (newargv == NULL)
{
free(arg);
SDL_free(arg);
return FALSE;
}
gArgv = newargv;
strcpy(arg, temparg);
SDL_strlcpy(arg, temparg, arglen);
gArgv[gArgc++] = arg;
gArgv[gArgc] = NULL;
return TRUE;
@ -346,7 +347,7 @@ int main (int argc, char **argv)
/* Copy the arguments into a global variable */
/* This is passed if we are launched by double-clicking */
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
gArgv = (char **) malloc(sizeof (char *) * 2);
gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
gArgv[0] = argv[0];
gArgv[1] = NULL;
gArgc = 1;
@ -354,7 +355,7 @@ int main (int argc, char **argv)
} else {
int i;
gArgc = argc;
gArgv = (char **) malloc(sizeof (char *) * (argc+1));
gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
for (i = 0; i <= argc; i++)
gArgv[i] = argv[i];
gFinderLaunch = NO;