summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch')
-rw-r--r--net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch b/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch
index 971d136fc988..bf4efec6042f 100644
--- a/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch
+++ b/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch
@@ -1,6 +1,6 @@
diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
---- squidGuard-1.4.orig/configure.in 2009-02-17 22:35:28.000000000 +0000
-+++ squidGuard-1.4/configure.in 2009-02-17 22:36:27.000000000 +0000
+--- squidGuard-1.4.orig/configure.in 2009-04-26 12:28:49.000000000 +0000
++++ squidGuard-1.4/configure.in 2009-04-26 12:29:35.000000000 +0000
@@ -421,7 +421,7 @@
AC_CHECK_FUNCS(regexec, , AC_MSG_ERROR([No regexec library function.]))
AC_CHECK_FUNCS(strdup, , AC_MSG_ERROR([No strdup library function.]))
@@ -12,7 +12,7 @@ diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in
diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c
--- squidGuard-1.4.orig/src/sgLog.c 2007-11-16 16:58:32.000000000 +0000
-+++ squidGuard-1.4/src/sgLog.c 2009-02-17 22:37:04.000000000 +0000
++++ squidGuard-1.4/src/sgLog.c 2009-04-26 12:31:40.000000000 +0000
@@ -55,7 +55,7 @@
char msg[MAX_BUF];
va_list ap;
@@ -22,15 +22,17 @@ diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c
fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
va_end(ap);
date = niso(0);
-@@ -87,7 +87,7 @@
+@@ -87,8 +87,8 @@
char msg[MAX_BUF];
va_list ap;
VA_START(ap, format);
- if(vsprintf(msg, format, ap) > (MAX_BUF - 1))
+- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
+ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1))
- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno));
++ fprintf(stderr,"overflow in vsprintf (sgLogError): %s",strerror(errno));
va_end(ap);
sgLog(globalErrorLog,"%s",msg);
+ }
@@ -104,7 +104,7 @@
char msg[MAX_BUF];
va_list ap;