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 39e13982579c9be433a7a7185c2e69e30f91d5db (commit)
via abc2d13f7db338fd8d1e436ea6c0c40c3eca9f76 (commit)
via 8d731b719ef6609190f098a23cb1858dbb037618 (commit)
via f5cb2f3d1c2301c9aaee6ea1441b8706b2b1cc3b (commit)
via f6b9fc88701f983c25b8046cbc2e34f53d2c68e9 (commit)
via d0bb7ae0c842b24f5bb8ce22f4945dddb0384407 (commit)
from 16045a6be4208efea61a2eaed572f71a5f7ca567 (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/39e13982579c9be433a7a7185c2e69e30f91d5db
commit 39e13982579c9be433a7a7185c2e69e30f91d5db
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 14:15:51 2014 +0800
WINGs: correct possible null pointer dereference
As reported by cppcheck:
[WINGs/array.c:129] -> [WINGs/array.c:131]: (warning) Possible null pointer
dereference: array - otherwise it is redundant to check it against null.
[WINGs/array.c:151] -> [WINGs/array.c:153]: (warning) Possible null pointer
dereference: array - otherwise it is redundant to check it against null.
[WINGs/array.c:170] -> [WINGs/array.c:172]: (warning) Possible null pointer
dereference: array - otherwise it is redundant to check it against null.
This patch is checking that the var name 'array' exists.
diff --git a/WINGs/array.c b/WINGs/array.c
index 0e083428..0b5be944 100644
--- a/WINGs/array.c
+++ b/WINGs/array.c
@@ -126,7 +126,7 @@ void WMAddToArray(WMArray * array, void *item)
void WMInsertInArray(WMArray * array, int index, void *item)
{
- wassertr(index >= 0 && index <= array->itemCount);
+ wassertr(array && index >= 0 && index <= array->itemCount);
if (array == NULL)
return;
@@ -148,7 +148,7 @@ void *WMReplaceInArray(WMArray * array, int index, void
*item)
{
void *old;
- wassertrv(index >= 0 && index <= array->itemCount, NULL);
+ wassertrv(array && index >= 0 && index <= array->itemCount, NULL);
if (array == NULL)
return NULL;
@@ -167,7 +167,7 @@ void *WMReplaceInArray(WMArray * array, int index, void
*item)
int WMDeleteFromArray(WMArray * array, int index)
{
- wassertrv(index >= 0 && index < array->itemCount, 0);
+ wassertrv(array && index >= 0 && index < array->itemCount, 0);
if (array == NULL)
return 0;
http://repo.or.cz/w/wmaker-crm.git/commit/abc2d13f7db338fd8d1e436ea6c0c40c3eca9f76
commit abc2d13f7db338fd8d1e436ea6c0c40c3eca9f76
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 14:25:24 2014 +0800
wmaker: main.c fix realloc mistake
As reported by cppcheck:
[src/main.c:141]: (error) Common realloc mistake: 'wVisualID' nulled but
not freed upon failure
The patch is using wrealloc instead of the standard realloc().
diff --git a/src/main.c b/src/main.c
index bc147216..df8bf4a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,7 +138,7 @@ static void setWVisualID(int screen, int val)
int oldlen = wVisualID_len;
wVisualID_len = screen + 1;
- wVisualID = (int *)realloc(wVisualID, wVisualID_len *
sizeof(int));
+ wVisualID = (int *)wrealloc(wVisualID, wVisualID_len *
sizeof(int));
for (i = oldlen; i < wVisualID_len; i++) {
wVisualID[i] = -1;
}
http://repo.or.cz/w/wmaker-crm.git/commit/8d731b719ef6609190f098a23cb1858dbb037618
commit 8d731b719ef6609190f098a23cb1858dbb037618
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 14:23:49 2014 +0800
wmaker: superfluous.c possible null pointer dereference
As reported by cppcheck:
[src/superfluous.c:238] -> [src/superfluous.c:199]: (warning) Possible null
pointer dereference: aicon - otherwise it is redundant to check it against null.
[src/superfluous.c:239] -> [src/superfluous.c:199]: (warning) Possible null
pointer dereference: aicon - otherwise it is redundant to check it against null.
[src/superfluous.c:240] -> [src/superfluous.c:199]: (warning) Possible null
pointer dereference: aicon - otherwise it is redundant to check it against null.
The patch is adding a test to check if variable aicon exists.
diff --git a/src/superfluous.c b/src/superfluous.c
index 0883cc11..4e30542f 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -195,8 +195,11 @@ static void doAppBounce(void *arg)
AppBouncerData *data = (AppBouncerData*)arg;
WAppIcon *aicon = data->wapp->app_icon;
+ if (!aicon)
+ return;
+
reinit:
- if (aicon && data->wapp->refcount > 1) {
+ if (data->wapp->refcount > 1) {
if (wPreferences.raise_appicons_when_bouncing)
XRaiseWindow(dpy, aicon->icon->core->window);
http://repo.or.cz/w/wmaker-crm.git/commit/f5cb2f3d1c2301c9aaee6ea1441b8706b2b1cc3b
commit f5cb2f3d1c2301c9aaee6ea1441b8706b2b1cc3b
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 14:22:31 2014 +0800
wmaker: dock.c possible null pointer dereference
As reported by cppcheck:
[src/dock.c:568] -> [src/dock.c:571]: (warning) Possible null pointer
dereference: aicon - otherwise it is redundant to check it against null.
The aicon test is useless, the patch is removing it.
diff --git a/src/dock.c b/src/dock.c
index 8b93a506..6144c75d 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -568,7 +568,7 @@ static void keepIconsCallback(WMenu *menu, WMenuEntry
*entry)
if (aicon->icon->selected)
wIconSelect(aicon->icon);
- if (aicon && aicon->attracted && aicon->command) {
+ if (aicon->attracted && aicon->command) {
aicon->attracted = 0;
if (aicon->icon->shadowed) {
aicon->icon->shadowed = 0;
http://repo.or.cz/w/wmaker-crm.git/commit/f6b9fc88701f983c25b8046cbc2e34f53d2c68e9
commit f6b9fc88701f983c25b8046cbc2e34f53d2c68e9
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 10:41:12 2014 +0800
WINGs/Tests: make them compile again
This patch is adding the missing X11 libs reference.
diff --git a/WINGs/Tests/Makefile.am b/WINGs/Tests/Makefile.am
index de6070eb..8be4edb8 100644
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -6,7 +6,7 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget
LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la
$(top_builddir)/WINGs/libWUtil.la - @XFTLIBS@ @INTLIBS@
+ @XFTLIBS@ @INTLIBS@ @XLIBS@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
http://repo.or.cz/w/wmaker-crm.git/commit/d0bb7ae0c842b24f5bb8ce22f4945dddb0384407
commit d0bb7ae0c842b24f5bb8ce22f4945dddb0384407
Author: David Maciejak <[email protected]>
Date: Sun Jul 27 10:46:10 2014 +0800
wrlib/tests: fix testgrad memory leak
cppcheck is reporting:
[wrlib/tests/testgrad.c:148]: (error) Memory leak: color_name
but seems some other variables were never freed.
This patch is cleaning them property.
diff --git a/wrlib/tests/testgrad.c b/wrlib/tests/testgrad.c
index b4a32570..0b5a7994 100644
--- a/wrlib/tests/testgrad.c
+++ b/wrlib/tests/testgrad.c
@@ -135,15 +135,28 @@ int main(int argc, char **argv)
imgd = RRenderMultiGradient(250, 250, colors, RGRD_DIAGONAL);
RConvertImage(ctx, imgh, &pix);
XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 0, 0);
+ RReleaseImage(imgh);
RConvertImage(ctx, imgv, &pix);
XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 250, 0);
+ RReleaseImage(imgv);
RConvertImage(ctx, imgd, &pix);
XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 500, 0);
+ RReleaseImage(imgd);
XFlush(dpy);
getchar();
+
+ free(color_name);
+ for (i = 0; i < ncolors + 1; i++)
+ free(colors[i]);
+ free(colors);
+
+ RDestroyContext(ctx);
+ RShutdown();
+ XCloseDisplay(dpy);
+
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
WINGs/Tests/Makefile.am | 2 +-
WINGs/array.c | 6 +++---
src/dock.c | 2 +-
src/main.c | 2 +-
src/superfluous.c | 5 ++++-
wrlib/tests/testgrad.c | 13 +++++++++++++
6 files changed, 23 insertions(+), 7 deletions(-)
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 ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
