updated: [c26e289] panel: fixed crash when rename/copy (introduced by revert of mhl_strmove)

Sergei Trofimovich slyfox at inbox.ru
Tue Feb 10 11:49:58 UTC 2009


The following commit has been merged in the master branch:
commit c26e289b9f0a27bde985180aaa749cbcdfd3db2f
Author: Sergei Trofimovich <slyfox at inbox.ru>
Date:   Sat Feb 7 16:20:03 2009 +0200

    panel: fixed crash when rename/copy (introduced by revert of mhl_strmove)
    
    g_strconcat expects 0 as last argument, but mhl_strmove is not.
    When reverting this detail was overlooked. Returning 0 as last argument.
    
    Signed-off-by: Sergei Trofimovich <slyfox at inbox.ru>

diff --git a/src/file.c b/src/file.c
index 81de8da..9e0e8c2 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1805,7 +1805,7 @@ panel_operate (void *source_panel, FileOperation operation,
 	else
 	    /* add trailing separator */
 	    if (*dest_dir && strcmp(&dest_dir[strlen(dest_dir)-1], PATH_SEP_STR)) {
-		dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR);
+		dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0);
 	} else {
 		dest_dir_ = g_strdup (dest_dir);
 	}

-- 
Midnight Commander Development



More information about the mc-devel mailing list