summaryrefslogtreecommitdiff
path: root/source3/utils/eventlogadm.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-30 21:48:33 +0100
committerVolker Lendecke <vl@samba.org>2009-11-30 21:48:59 +0100
commit6aef5e591f3fa1ceeedb22273d2fe04298b6e3fb (patch)
tree71eed40f3bdddd8085f57ef5ae581ee03bc0c30e /source3/utils/eventlogadm.c
parent3b7f8a759f57f32a8c1bc2db85236e88f616ffd9 (diff)
downloadsamba-6aef5e591f3fa1ceeedb22273d2fe04298b6e3fb.tar.gz
samba-6aef5e591f3fa1ceeedb22273d2fe04298b6e3fb.tar.bz2
samba-6aef5e591f3fa1ceeedb22273d2fe04298b6e3fb.zip
Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets
Diffstat (limited to 'source3/utils/eventlogadm.c')
-rw-r--r--source3/utils/eventlogadm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 7fc04b008e..415330f68c 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -118,7 +118,10 @@ static int DoWriteCommand( int argc, char **argv, bool debugflag, char *exename
if (fgets( linein, sizeof( linein ) - 1, f1 ) == NULL) {
break;
}
- linein[strlen( linein ) - 1] = 0; /* whack the line delimiter */
+ if ((strlen(linein) > 0)
+ && (linein[strlen(linein)-1] == '\n')) {
+ linein[strlen(linein)-1] = 0;
+ }
if ( debugflag )
printf( "Read line [%s]\n", linein );