Better fd handling

jeroennijhof · Dec 22, 2011 · 01472aa · 01472aa
1 parent 542f8f2
commit 01472aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 OWNER=root
 GROUP=root
 CC=gcc
-CFLAGS=-O2 -Wall -fno-tree-vrp
+CFLAGS=-O2 -Wall
 LIBS=-ldb
 SBINDIR=/usr/sbin
 

diff --git a/squidguard.c b/squidguard.c
@@ -70,10 +70,18 @@ int squidguard_closefd(FILE *sg_fd[2]) {
 int squidguard_backend(FILE *sg_fd[2], char srcip[15], char url[URL_SIZE], int debug) {
     char redirect_url[URL_SIZE];
 
+    if (sg_fd[1] == NULL) {
+        syslog(LOG_WARNING, "squidguard: could not open fd for input.");
+        return 0;
+    }
     fprintf(sg_fd[1], "%s %s/ - - GET\n", url, srcip);
     fflush(sg_fd[1]);
+
+    if (sg_fd[0] == NULL) {
+        syslog(LOG_WARNING, "squidguard: could not open fd for output.");
+        return 0;
+    }
     while (fgets(redirect_url, URL_SIZE, sg_fd[0]) != NULL) {
-        redirect_url[strlen(redirect_url) - 1] = '\0';
         if (debug > 1)
             syslog(LOG_INFO, "squidguard: redirect_url (%s).", redirect_url);
         if (strlen(redirect_url) > 1) {