aboutsummaryrefslogtreecommitdiff
path: root/libpwdgrp
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-01-03 17:53:49 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-01-03 17:53:49 +0100
commit5e62a3d016633d4d97906f0f73298dc8e8b6a42b (patch)
treeb0cdea416496237b3a15ea6f123371aff6168ecc /libpwdgrp
parent9dca6acaac3a49f1ff8ba9d3ca78853da6f59ae1 (diff)
downloadbusybox-5e62a3d016633d4d97906f0f73298dc8e8b6a42b.tar.gz
busybox-5e62a3d016633d4d97906f0f73298dc8e8b6a42b.tar.bz2
libpwdgrp: use a better estimate of max struct size
Previous code's trick with bitwise OR was giving this on 32-bit x86: sizeof(struct passwd):28 sizeof(struct group):16 sizeof(struct spwd):36 sizeof(struct_result):60 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libpwdgrp')
-rw-r--r--libpwdgrp/pwd_grp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 539d2b01f..f3fcec859 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -45,11 +45,10 @@ struct passdb {
uint8_t numfields;
FILE *fp;
char *malloced;
- char struct_result[0
- | sizeof(struct passwd)
- | sizeof(struct group)
- IF_USE_BB_SHADOW( | sizeof(struct spwd) )
- /* bitwise OR above is poor man's max(a,b,c) */
+ char struct_result[
+ /* Should be max(sizeof passwd,group,spwd), but this will do: */
+ IF_NOT_USE_BB_SHADOW(sizeof(struct passwd))
+ IF_USE_BB_SHADOW(sizeof(struct spwd))
];
};