diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | libidu/fnprint.c | 6 | ||||
| -rw-r--r-- | libidu/idfile.h | 15 | ||||
| -rw-r--r-- | src/lid.c | 4 |
4 files changed, 22 insertions, 7 deletions
@@ -2,6 +2,10 @@ GNU idutils NEWS -*- outline -*- * Noteworthy changes in release ?.? (????-??-??) [?] +** Bug fixes + + lid is no longer susceptible to a buffer overrun + * Noteworthy changes in release 4.6 (2012-02-03) [stable] diff --git a/libidu/fnprint.c b/libidu/fnprint.c index b8d97ce..4129441 100644 --- a/libidu/fnprint.c +++ b/libidu/fnprint.c @@ -46,11 +46,7 @@ root_name (char const *file_name) char const *dot = strrchr (file_name, '.'); if (dot) - { - int length = dot - file_name; - strncpy (file_name_buffer, file_name, length); - file_name_buffer[length] = '\0'; - } + stzncpy (file_name_buffer, file_name, dot - file_name); else strcpy (file_name_buffer, file_name); return file_name_buffer; diff --git a/libidu/idfile.h b/libidu/idfile.h index 739819d..3775d7a 100644 --- a/libidu/idfile.h +++ b/libidu/idfile.h @@ -225,4 +225,19 @@ extern off_t largest_member_file; #define DEFAULT_ID_FILE_NAME "ID" +/* Like stpncpy, but do ensure that the result is NUL-terminated, + and do not NUL-pad out to LEN. I.e., when strnlen (src, len) == len, + this function writes a NUL byte into dest[len]. Thus, the length + of the destination buffer must be at least LEN + 1. + The DEST and SRC buffers must not overlap. */ +static inline char * +stzncpy (char *restrict dest, char const *restrict src, size_t len) +{ + char const *src_end = src + len; + while (src < src_end && *src) + *dest++ = *src++; + *dest = 0; + return dest; +} + #endif /* not _idfile_h_ */ @@ -1042,7 +1042,7 @@ query_ambiguous_prefix (unsigned int limit, report_func_t report_func) { if (consecutive && key_style != ks_token) { - strncpy (&name[1], old, limit); + stzncpy (&name[1], old, limit - 2); (*report_func) (name, bits_to_flinkv (bits_vec)); } consecutive = 0; @@ -1064,7 +1064,7 @@ query_ambiguous_prefix (unsigned int limit, report_func_t report_func) } if (consecutive && key_style != ks_token) { - strncpy (&name[1], new, limit); + stzncpy (&name[1], new, limit - 2); (*report_func) (name, bits_to_flinkv (bits_vec)); } return count; |