d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build break by "Implement Redacted Send/Receive"

Browse Source 
30af21b025 broke build on Fedora. gcc can detect potential overflow
on compile-time. Consider strlen of already copied string.

Also change strn to strl variants per suggestion from @behlendorf
and @ofaaland.

--
libzfs_input_check.c: In function 'test_redact':
libzfs_input_check.c:711:2: error: 'strncat' specified bound 288 equals
 destination size [-Werror=stringop-overflow=]
  strncat(bookmark, "#testbookmark", sizeof (bookmark));
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Closes #8939
This commit is contained in:
Tomohiro Kusumi 2019-06-23 08:30:59 +09:00 committed by Brian Behlendorf
parent a370182fed
commit d5bf1cf179
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
View File

@ -706,9 +706,10 @@ test_redact(const char *snapshot1, const char *snapshot2)
nvlist_free(snapnv); nvlist_free(snapnv);
nvlist_free(required); nvlist_free(required);
strncpy(bookmark, snapshot1, sizeof (bookmark) - 1); strlcpy(bookmark, snapshot1, sizeof (bookmark));
*strchr(bookmark, '@') = '\0'; *strchr(bookmark, '@') = '\0';
strncat(bookmark, "#testbookmark", sizeof (bookmark)); strlcat(bookmark, "#testbookmark", sizeof (bookmark) -
strlen(bookmark));
zfs_destroy(bookmark); zfs_destroy(bookmark);
} }