diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-01-22 20:57:24 +0100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-01-23 07:45:54 +1100 |
| commit | d908b292c92f8fc061c1e7465ff9211fa3ca5893 (patch) | |
| tree | 5ff56988cac8b0712e85fa87ea482a629a151b24 /src/share/grabbag/snprintf.c | |
| parent | 293d6b22cd09b8d9c376d447a933641da9828036 (diff) | |
| download | flac-d908b292c92f8fc061c1e7465ff9211fa3ca5893.tar.gz | |
Fix some cppcheck reports
* src/libFLAC/metadata_iterators.c:3247: (error) va_list `va` was opened
but not closed with va_end().
* src/share/grabbag/snprintf.c:66: (error) va_list `va` was opened but
not closed with va_end().
* src/utils/flactimer/main.cpp:84: (warning) Either the condition `!fout`
is redundant or there is possible null pointer dereference.
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Closes: https://github.com/xiph/flac/pull/8
Diffstat (limited to 'src/share/grabbag/snprintf.c')
| -rw-r--r-- | src/share/grabbag/snprintf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/share/grabbag/snprintf.c b/src/share/grabbag/snprintf.c index f037377c..5b7f482b 100644 --- a/src/share/grabbag/snprintf.c +++ b/src/share/grabbag/snprintf.c @@ -59,11 +59,14 @@ flac_snprintf(char *str, size_t size, const char *fmt, ...) va_list va; int rc; - va_start (va, fmt); - #if defined _MSC_VER if (size == 0) return 1024; +#endif + + va_start (va, fmt); + +#if defined _MSC_VER rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va); if (rc < 0) rc = size - 1; |