diff options
author | Jean Delvare <jdelvare@suse.de> | 2019-01-09 15:01:02 +0100 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2019-01-09 15:01:02 +0100 |
commit | 955b13bf47d9e2cc041a39d35465455a53eb5f09 (patch) | |
tree | d9cba82a911b71f7e4650c3ac6218752eabbc928 | |
parent | 4d476eb716c388d3c78e434b5e401e893067ab98 (diff) | |
download | i2c-tools-955b13bf47d9e2cc041a39d35465455a53eb5f09.tar.gz |
Consistently use snprintf instead of sprintf
There was a last instance of sprintf which somehow was not converted.
I know it can't fail, but for consistency, let's use snprintf and
check for truncation as we already do in gather_i2c_busses().
Signed-off-by: Jean Delvare <jdelvare@suse.de>
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | tools/i2cbusses.c | 15 |
2 files changed, 12 insertions, 4 deletions
@@ -2,6 +2,7 @@ i2c-tools CHANGES ----------------- master + tools: Consistently use snprintf instead of sprintf decode-dimms: Print SPD revision for DDR3 too Move SDR-specific code diff --git a/tools/i2cbusses.c b/tools/i2cbusses.c index ad06332..438f345 100644 --- a/tools/i2cbusses.c +++ b/tools/i2cbusses.c @@ -406,14 +406,21 @@ int parse_i2c_address(const char *address_arg, int all_addrs) int open_i2c_dev(int i2cbus, char *filename, size_t size, int quiet) { - int file; + int file, len; - snprintf(filename, size, "/dev/i2c/%d", i2cbus); - filename[size - 1] = '\0'; + len = snprintf(filename, size, "/dev/i2c/%d", i2cbus); + if (len >= (int)size) { + fprintf(stderr, "%s: path truncated\n", filename); + return -EOVERFLOW; + } file = open(filename, O_RDWR); if (file < 0 && (errno == ENOENT || errno == ENOTDIR)) { - sprintf(filename, "/dev/i2c-%d", i2cbus); + len = snprintf(filename, size, "/dev/i2c-%d", i2cbus); + if (len >= (int)size) { + fprintf(stderr, "%s: path truncated\n", filename); + return -EOVERFLOW; + } file = open(filename, O_RDWR); } |