Merge branch 'master' of git.sinitax.com:sinitax/tquery

2 files changed, 11 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 7d7e759..011a430 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,18 @@
 PREFIX ?= /usr/local
 BINDIR ?= /bin
 
-CFLAGS = -std=c99 -D_XOPEN_SOURCE=700 -Og -g -Wunused-function \
-	-Wunused-variable -Wconversion -Wsign-compare -Wuninitialized \
-	$(CFLAGS_EXTRA)
+CFLAGS = -std=c99 -D_XOPEN_SOURCE=700 -Wunused-function -Wunused-variable \
+		 -Wconversion -Wsign-compare -Wuninitialized
 LDFLAGS = -lcurses
 
+ifeq ($(DEBUG),1)
+	CFLAGS += -fsanitize=address -Og -g
+else
+	CFLAGS += -O3
+endif
+
+CFLAGS += $(CFLAGS_EXTRA)
+
 all: tquery
 
 clean:
diff --git a/tquery.c b/tquery.c
index e8ac436..0476bf7 100644
--- a/tquery.c
+++ b/tquery.c
@@ -156,6 +156,7 @@ invoke(const char **argv, pid_t *pid, int *fd, bool in, bool out, bool err)
 	*pid = fork();
 	if (*pid < 0) die("fork:");
 	if (!*pid) {
+		if (child_fd) close(child_fd);
 		if (!in || !out || !err) {
 			int zfd = open("/dev/null", O_RDWR);
 			if (zfd < 0) die("open /dev/null");