Merge "Bug 3330205 Thread safety for bignum powers of 5"

This commit is contained in:
David Turner
2011-02-03 04:45:51 -08:00
committed by Android (Google) Code Review

View File

@@ -754,6 +754,7 @@ mult
} }
static Bigint *p5s; static Bigint *p5s;
static pthread_mutex_t p5s_mutex = PTHREAD_MUTEX_INITIALIZER;
static Bigint * static Bigint *
pow5mult pow5mult
@@ -775,11 +776,13 @@ pow5mult
if (!(k = (unsigned int) k >> 2)) if (!(k = (unsigned int) k >> 2))
return b; return b;
mutex_lock(&p5s_mutex);
if (!(p5 = p5s)) { if (!(p5 = p5s)) {
/* first time */ /* first time */
p5 = i2b(625); p5 = i2b(625);
if (p5 == BIGINT_INVALID) { if (p5 == BIGINT_INVALID) {
Bfree(b); Bfree(b);
mutex_unlock(&p5s_mutex);
return p5; return p5;
} }
p5s = p5; p5s = p5;
@@ -797,6 +800,7 @@ pow5mult
p51 = mult(p5,p5); p51 = mult(p5,p5);
if (p51 == BIGINT_INVALID) { if (p51 == BIGINT_INVALID) {
Bfree(b); Bfree(b);
mutex_unlock(&p5s_mutex);
return p51; return p51;
} }
p5->next = p51; p5->next = p51;
@@ -804,6 +808,7 @@ pow5mult
} }
p5 = p51; p5 = p51;
} }
mutex_unlock(&p5s_mutex);
return b; return b;
} }