From b79d2f21e8f9c0d31568e82b77004a9bbe3b8be3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 8 Oct 2020 12:24:06 +0200
Subject: Fix potential strcmp() overflow, better packed struct for pipe

---
 src/userlist.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/userlist.c')

diff --git a/src/userlist.c b/src/userlist.c
index 4b03959..1f65eb5 100644
--- a/src/userlist.c
+++ b/src/userlist.c
@@ -84,8 +84,8 @@ int getUserList( struct user *outbuf, int size )
             for ( int j = 0; j < deadzone; ++j ) {
                 if ( outbuf[j].user[0] != '\0' && strcmp( outbuf[j].display, u->ut_host ) == 0 ) {
                     if ( outbuf[j].sessionLeader == u->ut_pid
-                            && strcmp( outbuf[j].user, u->ut_user ) == 0
-                            && strcmp( outbuf[j].device, u->ut_line ) == 0 ) {
+                            && strncmp( outbuf[j].user, u->ut_user, UT_NAMESIZE ) == 0
+                            && strncmp( outbuf[j].device, u->ut_line, UT_LINESIZE ) == 0 ) {
                         use = j;
                         break;
                     }
@@ -111,8 +111,8 @@ int getUserList( struct user *outbuf, int size )
                         use = j;
                     }
                 } else if ( outbuf[j].sessionLeader == u->ut_pid
-                        && strcmp( outbuf[j].user, u->ut_user ) == 0
-                        && strcmp( outbuf[j].device, u->ut_line ) == 0 ) {
+                        && strncmp( outbuf[j].user, u->ut_user, UT_NAMESIZE ) == 0
+                        && strncmp( outbuf[j].device, u->ut_line, UT_LINESIZE ) == 0 ) {
                     use = j;
                     break;
                 }
-- 
cgit v1.2.3-55-g7522