diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-05-08 20:11:22 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-05-08 20:11:22 -0500 |
| commit | 8d59ff51c5d05ece395da3df13dd06821f9154bf (patch) | |
| tree | 36f4c1b3b8ce72c7be4c1b7dc2aa075d9c28176f | |
| parent | e3d2ec038eb2b84928e718f5fddf8bdcca7e4c5b (diff) | |
| download | gcompat-8d59ff51c5d05ece395da3df13dd06821f9154bf.tar.gz gcompat-8d59ff51c5d05ece395da3df13dd06821f9154bf.tar.bz2 gcompat-8d59ff51c5d05ece395da3df13dd06821f9154bf.tar.xz gcompat-8d59ff51c5d05ece395da3df13dd06821f9154bf.zip | |
Don't use variables until ensuring they're non-NULL
| -rw-r--r-- | libgcompat/string.c | 3 | ||||
| -rw-r--r-- | libgcompat/wchar.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libgcompat/string.c b/libgcompat/string.c index acc0566..f96e8d6 100644 --- a/libgcompat/string.c +++ b/libgcompat/string.c @@ -103,10 +103,11 @@ weak_alias(__rawmemchr, rawmemchr); */ char *__stpcpy_chk(char *dest, const char *src, size_t destlen) { - size_t n = strlen(src) + 1; + size_t n; assert(dest != NULL); assert(src != NULL); + n = strlen(src) + 1; assert(destlen >= n); if (dest < src) { assert(dest + n <= src); diff --git a/libgcompat/wchar.c b/libgcompat/wchar.c index 1a5a23c..4ed7a7b 100644 --- a/libgcompat/wchar.c +++ b/libgcompat/wchar.c @@ -46,10 +46,11 @@ int __vswprintf_chk(wchar_t *s, size_t n, int flag, size_t slen, */ wchar_t *__wcscpy_chk(wchar_t *dest, const wchar_t *src, size_t n) { - size_t srclen = wcslen(src) + 1; + size_t srclen; assert(dest != NULL); assert(src != NULL); + srclen = wcslen(src) + 1; assert(n >= srclen); if (dest < src) { assert(dest + n <= src); |