[ros-diffs] [pschweitzer] 53782: [CRT] Rewritten _tfullpath(). This: - Fixes memory leak - Fixes null pointer use - Adds missing features - Sets errno

[pschweitzer at svn.reactos.org]

Author: pschweitzer
Date: Tue Sep 20 21:44:22 2011
New Revision: 53782

URL: http://svn.reactos.org/svn/reactos?rev=53782&view=rev
Log:
[CRT]
Rewritten _tfullpath(). This:
- Fixes memory leak
- Fixes null pointer use
- Adds missing features
- Sets errno

Modified:
    trunk/reactos/lib/sdk/crt/stdlib/fullpath.c

Modified: trunk/reactos/lib/sdk/crt/stdlib/fullpath.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/fullpath.c?rev=53782&r1=53781&r2=53782&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/stdlib/fullpath.c [iso-8859-1] Tue Sep 20 21:44:22 2011
@@ -1,11 +1,9 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS system libraries
- * FILE:        lib/msvcrt/stdlib/fullpath.c
+ * PROJECT:     ReactOS CRT library
+ * FILE:        lib/sdk/crt/stdlib/fullpath.c
  * PURPOSE:     Gets the fullpathname
- * PROGRAMER:   Ariadne
- * UPDATE HISTORY:
- *              28/12/98: Created
+ * PROGRAMER:   Pierre Schweitzer (pierre.schweitzer at reactos.org)
  */
 
 #include <precomp.h>
@@ -16,18 +14,60 @@
  */
 _TCHAR* _tfullpath(_TCHAR* absPath, const _TCHAR* relPath, size_t maxLength)
 {
+    _TCHAR* lpBuffer;
     _TCHAR* lpFilePart;
-    DWORD copied;
+    DWORD retval;
 
+    /* First check if entry relative path was given */
+    if (!relPath || relPath[0] == 0)
+    {
+        /* If not, just try to return current dir */
+        return _tgetcwd(absPath, maxLength);
+    }
+
+    /* If no output buffer was given */
     if (!absPath)
     {
+        /* Allocate one with fixed length */
         maxLength = MAX_PATH;
-        absPath = malloc(maxLength);
+        lpBuffer = malloc(maxLength);
+        if (!lpBuffer)
+        {
+            errno = ENOMEM;
+            return NULL;
+        }
+    }
+    else
+    {
+        lpBuffer = absPath;
     }
 
-    copied = GetFullPathName(relPath,(DWORD)maxLength,absPath,&lpFilePart);
-    if (copied == 0 || copied > maxLength)
+    /* Really get full path */
+    retval = GetFullPathName(relPath, (DWORD)maxLength, lpBuffer, &lpFilePart);
+    /* Check for failures */
+    if (retval > maxLength)
+    {
+        /* Path too long, free (if needed) and return */
+        if (!absPath)
+        {
+            free(lpBuffer);
+        }
+
+        errno = ERANGE;
         return NULL;
+    }
+    else if (!retval)
+    {
+        /* Other error, free (if needed), translate error, and return */
+        if (!absPath)
+        {
+            free(lpBuffer);
+        }
 
-    return absPath;
+        _dosmaperr(GetLastError());
+        return NULL;
+    }
+
+    /* Return buffer. Up to the caller to free if needed */
+    return lpBuffer;
 }