griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix restrict error in BLI_str_format_byte_unit

Browse Source 
Don't use sprintf to append a string to it's self.

Also correct BLI_str_rstrip_float_zero's return value.
This commit is contained in:
Campbell Barton
2018-05-27 10:25:52 +02:00
parent 7a0699db34
commit 12a9e9ae33
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenlib/intern/string.c
View File

@@ -799,6 +799,7 @@ int BLI_str_rstrip_float_zero(char *str, const char pad)
while (end_p != p && *end_p == '0') {
*end_p = pad;
end_p--;
totstrip++;
}
}
}
@@ -1022,13 +1023,13 @@ void BLI_str_format_byte_unit(char dst[15], long long int bytes, const bool base
decimals = MAX2(order - 1, 0);
/* Format value first, stripping away floating zeroes. */
sprintf(dst, "%.*f", decimals, bytes_converted);
BLI_str_rstrip_float_zero(dst, '\0');
/* Append unit. */
sprintf(dst, "%s %s", dst, base_10 ? units_base_10[order] : units_base_2[order]);
const size_t dst_len = 15;
size_t len = BLI_snprintf_rlen(dst, dst_len, "%.*f", decimals, bytes_converted);
len -= (size_t)BLI_str_rstrip_float_zero(dst, '\0');
dst[len++] = ' ';
BLI_strncpy(dst + len, base_10 ? units_base_10[order] : units_base_2[order], dst_len - len);
}
/**
* Find the ranges needed to split \a str into its individual words.
*