git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix usage of zsb after free
[zfs.git]
/
cmd
/
zfs
/
zfs_main.c
diff --git
a/cmd/zfs/zfs_main.c
b/cmd/zfs/zfs_main.c
index
5354477
..
82a6d56
100644
(file)
--- a/
cmd/zfs/zfs_main.c
+++ b/
cmd/zfs/zfs_main.c
@@
-4457,7
+4457,7
@@
construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
while (curr < end) {
const char *who;
while (curr < end) {
const char *who;
- zfs_deleg_who_type_t who_type;
+ zfs_deleg_who_type_t who_type
= ZFS_DELEG_WHO_UNKNOWN
;
char *endch;
char *delim = strchr(curr, ',');
char errbuf[256];
char *endch;
char *delim = strchr(curr, ',');
char errbuf[256];
@@
-4562,7
+4562,7
@@
print_set_creat_perms(uu_avl_t *who_avl)
deleg_perm_node_t *deleg_node;
if (prev_weight != weight) {
deleg_perm_node_t *deleg_node;
if (prev_weight != weight) {
- (void) printf(*title_ptr++);
+ (void) printf(
"%s",
*title_ptr++);
prev_weight = weight;
}
prev_weight = weight;
}
@@
-4617,7
+4617,7
@@
print_uge_deleg_perms(uu_avl_t *who_avl, boolean_t local, boolean_t descend,
const char *who = NULL;
if (prt_title) {
prt_title = B_FALSE;
const char *who = NULL;
if (prt_title) {
prt_title = B_FALSE;
- (void) printf(title);
+ (void) printf(
"%s",
title);
}
switch (who_type) {
}
switch (who_type) {
@@
-4676,7
+4676,7
@@
print_fs_perms(fs_perm_set_t *fspset)
(void) snprintf(buf, ZFS_MAXNAMELEN+32,
gettext("---- Permissions on %s "),
node->fspn_fsperm.fsp_name);
(void) snprintf(buf, ZFS_MAXNAMELEN+32,
gettext("---- Permissions on %s "),
node->fspn_fsperm.fsp_name);
- (void) printf(dsname);
+ (void) printf(
"%s",
dsname);
left = 70 - strlen(buf);
while (left-- > 0)
(void) printf("-");
left = 70 - strlen(buf);
while (left-- > 0)
(void) printf("-");