1
0
mirror of https://github.com/golang/go synced 2024-11-18 15:44:41 -07:00

added protection against race condition

between first and second pass of converting
[]int to string.

R=r
OCL=29467
CL=29467
This commit is contained in:
Ken Thompson 2009-05-27 15:56:44 -07:00
parent 64c3fe05bf
commit 77f668a0f1

View File

@ -184,21 +184,25 @@ sys·arraystring(Array b, String s)
void void
sys·arraystringi(Array b, String s) sys·arraystringi(Array b, String s)
{ {
int32 siz, i; int32 siz1, siz2, i;
int32 *a; int32 *a;
byte dum[8]; byte dum[8];
a = (int32*)b.array; a = (int32*)b.array;
siz = 0; siz1 = 0;
for(i=0; i<b.nel; i++) { for(i=0; i<b.nel; i++) {
siz += runetochar(dum, a[i]); siz1 += runetochar(dum, a[i]);
} }
s = gostringsize(siz); s = gostringsize(siz1+4);
siz = 0; siz2 = 0;
for(i=0; i<b.nel; i++) { for(i=0; i<b.nel; i++) {
siz += runetochar(s.str+siz, a[i]); // check for race
if(siz2 >= siz1)
break;
siz2 += runetochar(s.str+siz2, a[i]);
} }
s.len = siz2;
FLUSH(&s); FLUSH(&s);
} }