emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix off-by-one mistakes

Browse Source 
The buffers have a size of 512 (see xmalloc() above), which is what
snprintf(3) expects.

Link: <https://github.com/shadow-maint/shadow/pull/607>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2022-12-16 00:52:27 +01:00 committed by Iker Pedrosa
parent b990b167d4
commit 587ce83e3f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/groupmod.c
View File

@ -554,13 +554,13 @@ static void prepare_failure_reports (void)
#endif #endif
info_passwd.audit_msg = xmalloc (512); info_passwd.audit_msg = xmalloc (512);
(void) snprintf (info_group.audit_msg, 511, (void) snprintf (info_group.audit_msg, 512,
"changing %s; ", gr_dbname ()); "changing %s; ", gr_dbname ());
#ifdef SHADOWGRP #ifdef SHADOWGRP
(void) snprintf (info_gshadow.audit_msg, 511, (void) snprintf (info_gshadow.audit_msg, 512,
"changing %s; ", sgr_dbname ()); "changing %s; ", sgr_dbname ());
#endif #endif
(void) snprintf (info_passwd.audit_msg, 511, (void) snprintf (info_passwd.audit_msg, 512,
"changing %s; ", pw_dbname ()); "changing %s; ", pw_dbname ());
info_group.action = info_group.audit_msg info_group.action = info_group.audit_msg
@ -573,16 +573,16 @@ static void prepare_failure_reports (void)
+ strlen (info_passwd.audit_msg); + strlen (info_passwd.audit_msg);
(void) snprintf (info_group.action, (void) snprintf (info_group.action,
511 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"group %s/%lu", "group %s/%lu",
group_name, (unsigned long int) group_id); group_name, (unsigned long int) group_id);
#ifdef SHADOWGRP #ifdef SHADOWGRP
(void) snprintf (info_gshadow.action, (void) snprintf (info_gshadow.action,
511 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"group %s", group_name); "group %s", group_name);
#endif #endif
(void) snprintf (info_passwd.action, (void) snprintf (info_passwd.action,
511 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"group %s/%lu", "group %s/%lu",
group_name, (unsigned long int) group_id); group_name, (unsigned long int) group_id);
@ -617,13 +617,13 @@ static void prepare_failure_reports (void)
strncat (info_group.action, ", new gid: ", strncat (info_group.action, ", new gid: ",
511 - strlen (info_group.audit_msg)); 511 - strlen (info_group.audit_msg));
(void) snprintf (info_group.action+strlen (info_group.action), (void) snprintf (info_group.action+strlen (info_group.action),
511 - strlen (info_group.audit_msg), 512 - strlen (info_group.audit_msg),
"%lu", (unsigned long int) group_newid); "%lu", (unsigned long int) group_newid);
strncat (info_passwd.action, ", new gid: ", strncat (info_passwd.action, ", new gid: ",
511 - strlen (info_passwd.audit_msg)); 511 - strlen (info_passwd.audit_msg));
(void) snprintf (info_passwd.action+strlen (info_passwd.action), (void) snprintf (info_passwd.action+strlen (info_passwd.action),
511 - strlen (info_passwd.audit_msg), 512 - strlen (info_passwd.audit_msg),
"%lu", (unsigned long int) group_newid); "%lu", (unsigned long int) group_newid);
} }
info_group.audit_msg[511] = '\0'; info_group.audit_msg[511] = '\0';