BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix #61: Silence a warning 

- Silence a FORTIFY_SOURCE warning. Thanks to @smlx for reporting.

- Add -O2 -D_FORTIFY_SOURCE=2 to default CFLAGS in Makefile.

- Use a cleaner way to resolve the writing-to-freed-memory issue
  mentioned in last commit.
This commit is contained in:
Richard Grenville 2012-11-04 19:14:21 +08:00
parent dc04a7d8ca
commit b15d40ec09
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ ifeq "$(NO_VSYNC_OPENGL)" ""
LIBS += -lGL LIBS += -lGL
endif endif
CFLAGS ?= -DNDEBUG CFLAGS ?= -DNDEBUG -O2 -D_FORTIFY_SOURCE=2
CFLAGS += $(CFG) CFLAGS += $(CFG)
LIBS += $(shell pkg-config --libs $(PACKAGES)) LIBS += $(shell pkg-config --libs $(PACKAGES))

22
src/compton.c
View File

@ -1526,21 +1526,19 @@ paint_preprocess(Display *dpy, win *list) {
} }
// Avoid setting w->to_paint if w is to be freed
bool destroyed = (w->opacity_tgt == w->opacity && w->destroyed);
if (to_paint) { if (to_paint) {
w->prev_trans = t; w->prev_trans = t;
t = w; t = w;
w->to_paint = to_paint;
}
else {
// Avoid setting w->to_paint if w is to be freed
if (!(w->opacity_tgt == w->opacity && w->destroyed)) {
check_fade_fin(dpy, w);
w->to_paint = to_paint;
} }
else { else {
check_fade_fin(dpy, w); check_fade_fin(dpy, w);
} }
}
if (!destroyed)
w->to_paint = to_paint;
} }
return t; return t;
@ -3567,9 +3565,11 @@ fork_after(void) {
setsid(); setsid();
freopen("/dev/null", "r", stdin); // Mainly to suppress the _FORTIFY_SOURCE warning
freopen("/dev/null", "w", stdout); if (!freopen("/dev/null", "r", stdin)
freopen("/dev/null", "w", stderr); || !freopen("/dev/null", "w", stdout)
|| !freopen("/dev/null", "w", stderr))
fprintf(stderr, "fork_after(): freopen() failed.");
} }
#ifdef CONFIG_LIBCONFIG #ifdef CONFIG_LIBCONFIG