shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Fix C99 error case handling (snprintf ret value >= buffer size).

Browse Source
This commit is contained in:
Alasdair Kergon 2001-12-31 15:17:34 +00:00
parent 52f71ce77b
commit 6c94692bc6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/misc/lvm-string.h
View File

@ -10,19 +10,23 @@
#include <stdarg.h> #include <stdarg.h>
/* /*
* Different versions of glibc have different * On error, up to glibc 2.0.6, snprintf returned -1 if buffer was too small;
* return values for over full buffers. * From glibc 2.1 it returns number of chars (excl. trailing null) that would
* have been written had there been room.
*
* lvm_snprintf reverts to the old behaviour.
*/ */
static inline int lvm_snprintf(char *str, size_t size, const char *format, ...) static inline int lvm_snprintf(char *buf, size_t bufsize,
const char *format, ...)
{ {
int n; int n;
va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
n = vsnprintf(str, size, format, ap); n = vsnprintf(buf, bufsize, format, ap);
va_end(ap); va_end(ap);
if (n < 0 || (n == size)) if (n < 0 || (n > bufsize - 1))
return -1; return -1;
return n; return n;