salvager: Fix volume parsing on 64-bit

[openafs.git] / src / vol / salvager.c

diff --git a/src/vol/salvager.c b/src/vol/salvager.c
index 88d0ec1..7da1373 100644 (file)
--- a/src/vol/salvager.c
+++ b/src/vol/salvager.c
@@ -181,17 +181,19 @@ handleit(struct cmd_syndesc *as, void *arock)
     }
     if ((ti = as->parms[1].items)) {   /* -volumeid */
        char *end;
+       unsigned long vid_l;
        if (!seenpart) {
            printf
                ("You must also specify '-partition' option with the '-volumeid' option\n");
            exit(-1);
        }
        seenvol = 1;
-       vid = strtoul(ti->data, &end, 10);
-       if (vid == ULONG_MAX || *end != '\0') {
+       vid_l = strtoul(ti->data, &end, 10);
+       if (vid_l >= MAX_AFS_UINT32 || vid_l == ULONG_MAX || *end != '\0') {
            Log("salvage: invalid volume id specified; salvage aborted\n");
            Exit(1);
        }
+       vid = (VolumeId)vid_l;
     }
     if (as->parms[2].items)    /* -debug */
        debug = 1;