shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: revert incorrect path length size for sscanf

Browse Source 
Commit 94786a3bbf introduced
another bug - since sscanf needs extra 1 byte for \0.

Since there is no easy way to do a macro evaluation for (PATH_MAX-1)
and string concatation of this number to get resulting (%4095s) - let's
go with easiest path and restore extra byte for 0.

Other option would be to prepare sscanf parsing string in runtime.

But lets resolve it when we look at PATH_MAX handling later...
This commit is contained in:
Zdenek Kabelac 2014-08-29 11:52:45 +02:00
parent 2faf416e0e
commit 93e9b3a1d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdm/libdm-common.c
View File

@ -1649,8 +1649,8 @@ static void _unmangle_mountinfo_string(const char *src, char *buf)
/* Parse one line of mountinfo and unmangled target line */ /* Parse one line of mountinfo and unmangled target line */
static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min, char *buf) static int _mountinfo_parse_line(const char *line, unsigned *maj, unsigned *min, char *buf)
{ {
char root[PATH_MAX]; char root[PATH_MAX + 1]; /* sscanf needs extra '\0' */
char target[PATH_MAX]; char target[PATH_MAX + 1];
/* TODO: maybe detect availability of %ms glib support ? */ /* TODO: maybe detect availability of %ms glib support ? */
if (sscanf(line, "%*u %*u %u:%u %" DM_TO_STRING(PATH_MAX) if (sscanf(line, "%*u %*u %u:%u %" DM_TO_STRING(PATH_MAX)