From 11ba4182e6b48e088189729d68b4d0bc7a5e4619 Mon Sep 17 00:00:00 2001 From: Yann Droneaud Date: Tue, 30 Mar 2010 17:17:56 +0200 Subject: [PATCH] mkswap: fixed strtoll() usage - catch empty string - check against LLONG_MAX and LLONG_MIN instead of ULLONG_MAX and 0 Signed-off-by: Yann Droneaud --- disk-utils/mkswap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index bc6c1d29..2bf07ddb 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -565,8 +565,9 @@ main(int argc, char ** argv) { errno = 0; blks = strtoll(block_count, &tmp, 0); - if ((tmp && *tmp) || - (errno != 0 && (blks == ULLONG_MAX || blks == 0)) || + if ((tmp == block_count) || + (tmp && *tmp) || + (errno != 0 && (blks == LLONG_MAX || blks == LLONG_MIN)) || blks < 0) usage(); -- 2.39.5