diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/nat/linux-osdata.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a7ee02c..39cdb3a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-05-17 Tom Tromey <tromey@adacore.com> + * nat/linux-osdata.c (user_from_uid, time_from_time_t) + (group_from_gid): Subtract one from strncpy length. + +2021-05-17 Tom Tromey <tromey@adacore.com> + * source.c (add_path): Check 'p' before using 'p[-1]'. 2021-05-17 Tom Tromey <tromey@adacore.com> diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c index 7034dd8..12f66d3 100644 --- a/gdb/nat/linux-osdata.c +++ b/gdb/nat/linux-osdata.c @@ -212,7 +212,7 @@ user_from_uid (char *user, int maxlen, uid_t uid) if (pwentry) { - strncpy (user, pwentry->pw_name, maxlen); + strncpy (user, pwentry->pw_name, maxlen - 1); /* Ensure that the user name is null-terminated. */ user[maxlen - 1] = '\0'; } @@ -920,7 +920,7 @@ time_from_time_t (char *time, int maxlen, TIME_T seconds) characters long. */ char buf[30]; const char *time_str = ctime_r (&t, buf); - strncpy (time, time_str, maxlen); + strncpy (time, time_str, maxlen - 1); time[maxlen - 1] = '\0'; } } @@ -935,7 +935,7 @@ group_from_gid (char *group, int maxlen, gid_t gid) if (grentry) { - strncpy (group, grentry->gr_name, maxlen); + strncpy (group, grentry->gr_name, maxlen - 1); /* Ensure that the group name is null-terminated. */ group[maxlen - 1] = '\0'; } |