| 1 |
mrness 09/04/26 12:47:07 |
| 2 |
|
| 3 |
Modified: squidguard-1.4-vsnprintf.patch |
| 4 |
Log: |
| 5 |
Avoid entering emergency mode by using fprintf instead sgLogFatalError (#259272). |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: squidguard-1.4-vsnprintf.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- squidguard-1.4-vsnprintf.patch 17 Feb 2009 22:42:18 -0000 1.1 |
| 22 |
+++ squidguard-1.4-vsnprintf.patch 26 Apr 2009 12:47:07 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in |
| 25 |
---- squidGuard-1.4.orig/configure.in 2009-02-17 22:35:28.000000000 +0000 |
| 26 |
-+++ squidGuard-1.4/configure.in 2009-02-17 22:36:27.000000000 +0000 |
| 27 |
+--- squidGuard-1.4.orig/configure.in 2009-04-26 12:28:49.000000000 +0000 |
| 28 |
++++ squidGuard-1.4/configure.in 2009-04-26 12:29:35.000000000 +0000 |
| 29 |
@@ -421,7 +421,7 @@ |
| 30 |
AC_CHECK_FUNCS(regexec, , AC_MSG_ERROR([No regexec library function.])) |
| 31 |
AC_CHECK_FUNCS(strdup, , AC_MSG_ERROR([No strdup library function.])) |
| 32 |
@@ -12,7 +12,7 @@ |
| 33 |
|
| 34 |
diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c |
| 35 |
--- squidGuard-1.4.orig/src/sgLog.c 2007-11-16 16:58:32.000000000 +0000 |
| 36 |
-+++ squidGuard-1.4/src/sgLog.c 2009-02-17 22:37:04.000000000 +0000 |
| 37 |
++++ squidGuard-1.4/src/sgLog.c 2009-04-26 12:31:40.000000000 +0000 |
| 38 |
@@ -55,7 +55,7 @@ |
| 39 |
char msg[MAX_BUF]; |
| 40 |
va_list ap; |
| 41 |
@@ -22,15 +22,17 @@ |
| 42 |
fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno)); |
| 43 |
va_end(ap); |
| 44 |
date = niso(0); |
| 45 |
-@@ -87,7 +87,7 @@ |
| 46 |
+@@ -87,8 +87,8 @@ |
| 47 |
char msg[MAX_BUF]; |
| 48 |
va_list ap; |
| 49 |
VA_START(ap, format); |
| 50 |
- if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) |
| 51 |
+- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); |
| 52 |
+ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) |
| 53 |
- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); |
| 54 |
++ fprintf(stderr,"overflow in vsprintf (sgLogError): %s",strerror(errno)); |
| 55 |
va_end(ap); |
| 56 |
sgLog(globalErrorLog,"%s",msg); |
| 57 |
+ } |
| 58 |
@@ -104,7 +104,7 @@ |
| 59 |
char msg[MAX_BUF]; |
| 60 |
va_list ap; |
Archives