[Libreoffice-commits] .: desktop/unx

[Robert Nagy]

 desktop/unx/source/start.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ac8f9155e41e9a25bb298bf51c9afed1e6fbf92a
Author: Robert Nagy <robert at openbsd.org>
Date:   Tue Apr 5 21:58:11 2011 +0200

    pass pOrigPath (strdup'd) to dirname(3) instead of pPath to avoid double free
    
    from the dirname(3) manual:
    Both dirname() and basename() may modify the contents of path, so copies
    should be passed to these functions.
    Furthermore, dirname() and basename() may return pointers to statically
    allocated memory which may be overwritten by subsequent calls.

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 19420a9..b0f5ab3 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -216,12 +216,12 @@ get_app_path( const char *pAppExec )
     char pRealPath[PATH_MAX];
     rtl_uString *pResult;
 
-    char *pPath = strdup( pAppExec );
-    pPath = dirname( pPath );
+    char *pOrigPath = strdup( pAppExec );
+    char *pPath = dirname( pOrigPath );
 
     realpath( pPath, pRealPath );
     pResult = charp_to_ustr( pRealPath );
-    free( pPath );
+    free( pOrigPath );
 
     return pResult;
 }