protect against failure to get database key, r=travis

This commit is contained in:
morse%netscape.com 2000-02-09 01:18:22 +00:00
parent 6fe2ceb4f8
commit 4d1dd09a64

View File

@ -1388,7 +1388,12 @@ backup:
// Fallback to doing old access
NS_ASSERTION(0, "Bad! Using backup stream generator. Email dp@netscape.com");
backup_noassert:
return key.CharAt((PRInt32)(writeCount % key.Length()));
NS_ASSERTION(key.Length()>0, "Master Password was never established");
if (key.Length() > 0 ) {
return key.CharAt((PRInt32)(writeCount % key.Length()));
} else {
return '~'; /* What else can we do? We can't recover from this. */
}
}
PUBLIC PRBool