STABLE14-ubik-uninitialized-var-20081018

LICENSE MIT

'pass' must be initialized.  do so.

(cherry picked from commit 7e8c41d53fcd51ae0ff4420ba1027b354af306c8)

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 20ba9f24e33ecd3138e7f17bb4fb1574db0b635d..7aa4242a4708f07706628d94d696bcdece0d3e60 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -591,6 +591,7 @@ urecovery_Interact(void *dummy)
            }
 #endif
 
+           pass = 0;
            while (length > 0) {
                tlen = (length > sizeof(tbuffer) ? sizeof(tbuffer) : length);
 #ifndef AFS_PTHREAD_ENV

diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index 7fc21ed5d86a499f2b758d4ae91adeb5502d39c5..94c2a6f3595946a17d6b952392b1cb714eac5b5c 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -560,7 +560,6 @@ SDISK_SendFile(rxcall, file, length, avers)
        close(fd);
        goto failed;
     }
-#else
     pass = 0;
 #endif
     memcpy(&ubik_dbase->version, &tversion, sizeof(struct ubik_version));