diff options
| author | Matthias Huetsch <mhu@openoffice.org> | 2001-07-29 17:21:56 +0000 |
|---|---|---|
| committer | Matthias Huetsch <mhu@openoffice.org> | 2001-07-29 17:21:56 +0000 |
| commit | 64d1fea0a8c0e65b2073232803e406a681f7829b (patch) | |
| tree | 8575850e384bc75199adf5f15b33110349892134 /sal/osl | |
| parent | 89ac9a11d01d6545cf077e01a23a2408e609891c (diff) | |
#90353# Fixed invalid memory allocation function mix in 'osl_getFullPath()'.
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/process.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c index d8cc09bbe9e4..1a3fb699f6ac 100644 --- a/sal/osl/unx/process.c +++ b/sal/osl/unx/process.c @@ -2,9 +2,9 @@ * * $RCSfile: process.c,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hro $ $Date: 2001-07-20 16:08:14 $ + * last change: $Author: mhu $ $Date: 2001-07-29 18:21:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2007,14 +2007,14 @@ sal_Bool osl_getFullPath(const sal_Char* pszFilename, sal_Char* pszPath, sal_uIn { strcpy(Path, pDir); strcat(Path, "/"); - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ pDir = strdup("."); } if ((strlen(pDir) > 0) && ((stat(pDir, &status) < 0) || (! S_ISDIR(status.st_mode)))) { - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ return sal_False; } } @@ -2043,7 +2043,7 @@ sal_Bool osl_getFullPath(const sal_Char* pszFilename, sal_Char* pszPath, sal_uIn if (((dir = opendir(pBuffer)) == NULL) || (STAT_PARENT(pBuffer, &parent) < 0)) { - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ rtl_freeMemory(pBuffer); return sal_False; @@ -2055,7 +2055,7 @@ sal_Bool osl_getFullPath(const sal_Char* pszFilename, sal_Char* pszPath, sal_uIn { if ((entry = readdir(dir)) == NULL) { - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ rtl_freeMemory(pBuffer); return sal_False; @@ -2083,7 +2083,7 @@ sal_Bool osl_getFullPath(const sal_Char* pszFilename, sal_Char* pszPath, sal_uIn { rtl_freeMemory(full); - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ rtl_freeMemory(pBuffer); return sal_False; @@ -2112,7 +2112,7 @@ sal_Bool osl_getFullPath(const sal_Char* pszFilename, sal_Char* pszPath, sal_uIn strcat(pBuffer, "/.."); } - rtl_freeMemory(pDir); + free(pDir); /* @@@ rtl_freeMemory(pDir); @@@ */ rtl_freeMemory(pBuffer); if (strlen(Path) < MaxLen) |