This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via d2260cd39dc046ae984e826104d74c2e674fa10d (commit)
via c629e6f0f7bf1df07f1657a6d349c18fa159400e (commit)
from 0a6f78580d09e7425806487b80436042e6230505 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/d2260cd39dc046ae984e826104d74c2e674fa10d
commit d2260cd39dc046ae984e826104d74c2e674fa10d
Author: Christophe CURIS <[email protected]>
Date: Fri Jul 29 22:38:09 2011 +0200
Fix possible missing NUL at end of string
There are were a few uses of 'strncpy' that could lead to a missing NUL,
resulting in possible garbage being displayed. As suggested by Tamas,
use 'wstrlcpy' instead
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 7ebe8ba..c86dfdd 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -3400,9 +3400,8 @@ char *generateNewFilename(char *curName)
newName = wmalloc(baseLen + 16);
strncpy(newName, curName, baseLen);
- newName[baseLen] = 0;
- sprintf(&newName[baseLen], " {%i}", n + 1);
+ snprintf(&newName[baseLen], 16, " {%i}", n + 1);
return newName;
}
diff --git a/src/defaults.c b/src/defaults.c
index 300a0bb..dab5e64 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2005,7 +2005,7 @@ static int getKeybind(WScreen * scr, WDefaultEntry *
entry, WMPropList * value,
return True;
}
- strncpy(buf, val, MAX_SHORTCUT_LENGTH);
+ wstrlcpy(buf, val, MAX_SHORTCUT_LENGTH);
b = (char *)buf;
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 5592f73..0ecd3b4 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -424,7 +424,7 @@ static Bool addShortcut(char *file, char
*shortcutDefinition, WMenu * menu, WMen
ptr = wmalloc(sizeof(Shortcut));
- strncpy(buf, shortcutDefinition, MAX_SHORTCUT_LENGTH);
+ wstrlcpy(buf, shortcutDefinition, MAX_SHORTCUT_LENGTH);
b = (char *)buf;
/* get modifiers */
diff --git a/src/usermenu.c b/src/usermenu.c
index 0339bbb..49473c8 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -157,9 +157,9 @@ static WUserMenuData *convertShortcuts(WScreen * scr,
WMPropList * shortcut)
for (i = 0, j = 0; i < keycount; i++) {
data->key[j].modifier = 0;
if (WMIsPLArray(shortcut)) {
- strncpy(buf,
WMGetFromPLString(WMGetFromPLArray(shortcut, i)), MAX_SHORTCUT_LENGTH);
+ wstrlcpy(buf,
WMGetFromPLString(WMGetFromPLArray(shortcut, i)), MAX_SHORTCUT_LENGTH);
} else {
- strncpy(buf, WMGetFromPLString(shortcut),
MAX_SHORTCUT_LENGTH);
+ wstrlcpy(buf, WMGetFromPLString(shortcut),
MAX_SHORTCUT_LENGTH);
}
b = (char *)buf;
diff --git a/src/workspace.c b/src/workspace.c
index b726f7f..c0493f3 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -749,7 +749,7 @@ void wWorkspaceMenuUpdate(WScreen * scr, WMenu * menu)
i = scr->workspace_count - (menu->entry_no - 2);
ws = menu->entry_no - 2;
while (i > 0) {
- strncpy(title, scr->workspaces[ws]->name,
MAX_WORKSPACENAME_WIDTH);
+ wstrlcpy(title, scr->workspaces[ws]->name,
MAX_WORKSPACENAME_WIDTH);
entry = wMenuAddCallback(menu, title, switchWSCommand,
(void *)ws);
entry->flags.indicator = 1;
http://repo.or.cz/w/wmaker-crm.git/commit/c629e6f0f7bf1df07f1657a6d349c18fa159400e
commit c629e6f0f7bf1df07f1657a6d349c18fa159400e
Author: Carlos R. Mafra <[email protected]>
Date: Sat Aug 6 19:12:22 2011 +0200
Remove Netscape icon
diff --git a/WindowMaker/Icons/Makefile.am b/WindowMaker/Icons/Makefile.am
index b1df351..f114929 100644
--- a/WindowMaker/Icons/Makefile.am
+++ b/WindowMaker/Icons/Makefile.am
@@ -35,7 +35,6 @@ defsdata_DATA = mixer.xpm Mouth.png
Mozilla.png- Netscape.png notepad.tiff notepad.xpm pdf.tiffdiff
--git a/WindowMaker/Icons/Netscape.png b/WindowMaker/Icons/Netscape.png
deleted file mode 100644
index 2e7ccb6..0000000
Binary files a/WindowMaker/Icons/Netscape.png and /dev/null differ
-----------------------------------------------------------------------
Summary of changes:
WINGs/wcolorpanel.c | 3 +--
WindowMaker/Icons/Makefile.am | 1 -
WindowMaker/Icons/Netscape.png | Bin 2418 -> 0 bytes
src/defaults.c | 2 +-
src/rootmenu.c | 2 +-
src/usermenu.c | 4 ++--
src/workspace.c | 2 +-
7 files changed, 6 insertions(+), 8 deletions(-)
delete mode 100644 WindowMaker/Icons/Netscape.png
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("Fork from the last available CVS version of Window Maker")
--
To unsubscribe, send mail to [email protected].
