kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-17 01:02:12 +00:00
Code Issues Projects Releases Wiki Activity

fix windows line endings and fix potential memory leak from SWITCH_GLOBAL_dirs on win32.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2340 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2006-08-20 03:36:14 +00:00
parent c08217c886
commit 6d414c5644
2 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/switch_core.c
View File

@ -2963,25 +2963,25 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
GetModuleFileName( NULL, exePath, BUFSIZE ); GetModuleFileName( NULL, exePath, BUFSIZE );
lastbacklash = strrchr( exePath, '\\'); lastbacklash = strrchr( exePath, '\\');
exePath[(lastbacklash - exePath + 1)] = '\0'; exePath[(lastbacklash - exePath + 1)] = '\0';
if ((SWITCH_GLOBAL_dirs.base_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.base_dir && (SWITCH_GLOBAL_dirs.base_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.base_dir, BUFSIZE, "%s", exePath); snprintf(SWITCH_GLOBAL_dirs.base_dir, BUFSIZE, "%s", exePath);
} }
if ((SWITCH_GLOBAL_dirs.mod_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.mod_dir && (SWITCH_GLOBAL_dirs.mod_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.mod_dir, BUFSIZE, "%s\\mod", exePath); snprintf(SWITCH_GLOBAL_dirs.mod_dir, BUFSIZE, "%s\\mod", exePath);
} }
if ((SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.conf_dir && (SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.conf_dir, BUFSIZE, "%s\\conf", exePath); snprintf(SWITCH_GLOBAL_dirs.conf_dir, BUFSIZE, "%s\\conf", exePath);
} }
if ((SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.log_dir && (SWITCH_GLOBAL_dirs.log_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.log_dir, BUFSIZE, "%s\\log", exePath); snprintf(SWITCH_GLOBAL_dirs.log_dir, BUFSIZE, "%s\\log", exePath);
} }
if ((SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.db_dir && (SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.db_dir, BUFSIZE, "%s\\db", exePath); snprintf(SWITCH_GLOBAL_dirs.db_dir, BUFSIZE, "%s\\db", exePath);
} }
if ((SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.script_dir && (SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.script_dir, BUFSIZE, "%s\\scripts", exePath); snprintf(SWITCH_GLOBAL_dirs.script_dir, BUFSIZE, "%s\\scripts", exePath);
} }
if ((SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.htdocs_dir && (SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.htdocs_dir, BUFSIZE, "%s\\mod", exePath); snprintf(SWITCH_GLOBAL_dirs.htdocs_dir, BUFSIZE, "%s\\mod", exePath);
} }
#else #else
@ -2998,7 +2998,7 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
#else #else
#ifdef WIN32 #ifdef WIN32
GetTempPath(dwBufSize, lpPathBuffer); GetTempPath(dwBufSize, lpPathBuffer);
if ((SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(BUFSIZE))) { if (!SWITCH_GLOBAL_dirs.htdocs_dir && (SWITCH_GLOBAL_dirs.htdocs_dir = (char *) malloc(BUFSIZE))) {
snprintf(SWITCH_GLOBAL_dirs.htdocs_dir, BUFSIZE, "%s", lpPathBuffer); snprintf(SWITCH_GLOBAL_dirs.htdocs_dir, BUFSIZE, "%s", lpPathBuffer);
} }
#else #else
@ -3270,5 +3270,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
apr_terminate(); apr_terminate();
} }
#ifdef WIN32
free(SWITCH_GLOBAL_dirs.base_dir);
free(SWITCH_GLOBAL_dirs.mod_dir);
free(SWITCH_GLOBAL_dirs.conf_dir);
free(SWITCH_GLOBAL_dirs.log_dir);
free(SWITCH_GLOBAL_dirs.db_dir);
free(SWITCH_GLOBAL_dirs.script_dir);
free(SWITCH_GLOBAL_dirs.htdocs_dir);
free(SWITCH_GLOBAL_dirs.temp_dir);
#endif
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }