aboutsummaryrefslogtreecommitdiffstats
path: root/lib/e2p/ljs.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2018-10-04 10:39:50 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-10-04 10:39:50 -0400
commit62dfbc0fb2be77c4e0861c03601fd61dbb01e438 (patch)
tree76b14d3a4ccefdf9d46596194d9ef4f367ca5bdc /lib/e2p/ljs.c
parent76d5590a4fe7ef75c3319e77ee1317779e1c1707 (diff)
parentb0ec76d623f737a32abc5ab8bb7198bf1d9939a4 (diff)
downloadandroid_external_e2fsprogs-62dfbc0fb2be77c4e0861c03601fd61dbb01e438.tar.gz
android_external_e2fsprogs-62dfbc0fb2be77c4e0861c03601fd61dbb01e438.tar.bz2
android_external_e2fsprogs-62dfbc0fb2be77c4e0861c03601fd61dbb01e438.zip
Merge branch 'maint' into next
Diffstat (limited to 'lib/e2p/ljs.c')
-rw-r--r--lib/e2p/ljs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/e2p/ljs.c b/lib/e2p/ljs.c
index 0b1beadb..c99126b6 100644
--- a/lib/e2p/ljs.c
+++ b/lib/e2p/ljs.c
@@ -101,10 +101,10 @@ void e2p_list_journal_super(FILE *f, char *journal_sb_buf,
e2p_be32(jsb->s_checksum));
if ((nr_users > 1) ||
!e2p_is_null_uuid(&jsb->s_users[0])) {
- for (i=0; i < nr_users; i++) {
+ for (i=0; i < nr_users && i < JFS_USERS_MAX; i++) {
printf(i ? " %s\n"
: "Journal users: %s\n",
- e2p_uuid2str(&jsb->s_users[i*16]));
+ e2p_uuid2str(&jsb->s_users[i * UUID_SIZE]));
}
}
if (jsb->s_errno != 0)