45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
|
--- src/sgLog.c 2007-11-16 17:58:32.000000000 +0100
|
||
|
|
+++ squidGuard-1.4-patch-20091015/sgLog.c 2009-10-15 21:25:14.000000000 +0200
|
||
|
|
@@ -2,7 +2,7 @@
|
||
|
|
By accepting this notice, you agree to be bound by the following
|
||
|
|
agreements:
|
||
|
|
|
||
|
|
- This software product, squidGuard, is copyrighted (C) 1998-2007
|
||
|
|
+ This software product, squidGuard, is copyrighted (C) 1998-2009
|
||
|
|
by Christine Kronberg, Shalla Secure Services. All rights reserved.
|
||
|
|
|
||
|
|
This program is free software; you can redistribute it and/or modify it
|
||
|
|
@@ -55,8 +55,8 @@
|
||
|
|
char msg[MAX_BUF];
|
||
|
|
va_list ap;
|
||
|
|
VA_START(ap, format);
|
||
|
|
- if(vsprintf(msg, format, ap) > (MAX_BUF - 1))
|
||
|
|
- fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno));
|
||
|
|
+ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1))
|
||
|
|
+ fprintf(stderr,"overflow in vsnprintf (sgLog): %s",strerror(errno));
|
||
|
|
va_end(ap);
|
||
|
|
date = niso(0);
|
||
|
|
if(globalDebug || log == NULL) {
|
||
|
|
@@ -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))
|
||
|
|
+ sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
|
||
|
|
va_end(ap);
|
||
|
|
sgLog(globalErrorLog,"%s",msg);
|
||
|
|
}
|
||
|
|
@@ -104,8 +104,8 @@
|
||
|
|
char msg[MAX_BUF];
|
||
|
|
va_list ap;
|
||
|
|
VA_START(ap, format);
|
||
|
|
- if(vsprintf(msg, format, ap) > (MAX_BUF - 1))
|
||
|
|
- return;
|
||
|
|
+ if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1))
|
||
|
|
+ sgLog(globalErrorLog, "overflow in vsnprintf (sgLogError): %s",strerror(errno));
|
||
|
|
va_end(ap);
|
||
|
|
sgLog(globalErrorLog,"%s",msg);
|
||
|
|
sgEmergency();
|