Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 202270. Eliminate a potential infinite loop.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@142339 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com
2003-05-12 21:07:01 +00:00
parent 5c14f66ff5
commit fece9f41b3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/security/nss/lib/freebl/prng_fips1861.c
View File

@@ -31,7 +31,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: prng_fips1861.c,v 1.13 2003-03-24 22:25:51 ian.mcgreer%sun.com Exp $
* $Id: prng_fips1861.c,v 1.14 2003-05-12 21:07:01 nelsonb%netscape.com Exp $
*/
#include "prerr.h"
@@ -378,17 +378,20 @@ prng_GenerateGlobalRandomBytes(RNGContext *rng,
* If there are enough bytes of random data, send back Xj,
* else call alg3_1() with 0's to generate more random data.
*/
while (len > 0) {
if (rng->avail == 0)
while (len > 0 && rv == SECSuccess) {
if (rng->avail == 0) {
/* All available bytes are used, so generate more. */
rv = alg_fips186_1_x3_1(rng, NULL, q);
}
/* number of bytes to obtain on this iteration (max of 20) */
num = PR_MIN(rng->avail, len);
/* if avail < BSIZE, the first avail bytes have already been used. */
memcpy(output, rng->Xj + (BSIZE - rng->avail), num);
rng->avail -= num;
len -= num;
output += num;
if (num) {
memcpy(output, rng->Xj + (BSIZE - rng->avail), num);
rng->avail -= num;
len -= num;
output += num;
}
}
PZ_Unlock(rng->lock);
/* --- UNLOCKED --- */