Hi, I have a couple of minor fixes here:
~/.dt/errorlog not being rotated due to error in path construction
(last character gets chopped off, since snprintf writes size-1
characters max.)
A segfault in dtfile caused by double free when multiple files are
copied/moved per DND and there is exactly one collision.
"illegal mnemonic character" errors in dticon caused by wrong-sized
varargs on x86_64
>From a6df30cd0f03318000613f93f3dc65e7deb1d75b Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Thu, 2 Jul 2015 22:35:33 +0200
Subject: [PATCH 1/3] dtsession: fixed errorlog rotation
---
cde/programs/dtsession/SmGlobals.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cde/programs/dtsession/SmGlobals.c b/cde/programs/dtsession/SmGlobals.c
index 51eeeef..c98e236 100644
--- a/cde/programs/dtsession/SmGlobals.c
+++ b/cde/programs/dtsession/SmGlobals.c
@@ -1665,7 +1665,7 @@ TrimErrorlog( void )
len = strlen(home) + strlen(DtPERSONAL_CONFIG_DIRECTORY) + 2;
if (len > MAXPATHLEN) savePath = SM_REALLOC(savePath, len);
- snprintf(savePath, len - 1, "%s/%s", home, DtPERSONAL_CONFIG_DIRECTORY);
+ snprintf(savePath, len, "%s/%s", home, DtPERSONAL_CONFIG_DIRECTORY);
/*
* If errorlog.old exists and it is not empty, delete
--
2.4.2
>From 7dafe9af6834dd11048e8a9942dac4704c2dba6b Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Thu, 2 Jul 2015 22:38:08 +0200
Subject: [PATCH 2/3] dtfile: fixed double free in copy/move collision handler
---
cde/programs/dtfile/OverWrite.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cde/programs/dtfile/OverWrite.c b/cde/programs/dtfile/OverWrite.c
index 7600be3..d54024e 100644
--- a/cde/programs/dtfile/OverWrite.c
+++ b/cde/programs/dtfile/OverWrite.c
@@ -1523,7 +1523,7 @@ create_multicollide_dialog(Widget parent_widget,
s1 = (char *)XtCalloc( 1, 1 );
else if ( nChanged == 1 )
{
- s1 = eMsgOne;
+ s1 = XtNewString(eMsgOne);
}
else
{
--
2.4.2
>From daa7bed161d849909e2e471086964fc33c425439 Mon Sep 17 00:00:00 2001
From: alx <a...@fastestcode.org>
Date: Thu, 2 Jul 2015 22:44:13 +0200
Subject: [PATCH 3/3] dticon: KeySym is not char
---
cde/programs/dticon/dtIconShell.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cde/programs/dticon/dtIconShell.c b/cde/programs/dticon/dtIconShell.c
index 69d2ea2..98f001b 100644
--- a/cde/programs/dticon/dtIconShell.c
+++ b/cde/programs/dticon/dtIconShell.c
@@ -889,7 +889,7 @@ build_dtIconShell( void )
/* GETSTR uses a static buffer which may be overwritten */
/* on subsequent calls, so save character in mnemonic */
char * mnemonicStr;
- char mnemonic;
+ KeySym mnemonic;
/* use tmpStr as tmp string holder so GETSTR won't trash string */
tmpStr2 = GETSTR(12,3, "Icon Editor - (UNTITLED)");
--
2.4.2
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
