Context Navigation

Changeset 167

Timestamp:

06/04/06 04:58:45 (2 years ago)

Author:

krobillard

Message:

Fixed a couple cases where reading beyond end of buffer.
Optimized ur_arrayErase() when elemSize == 16 and WORDSIZE == 64.

Location:

trunk

Files:

r42	r167
127	127	else if( elemSize == 16 )
128	128	{
	129	#if __WORDSIZE == 64
	130	uint64_t* buf;
	131	uint64_t* src;
	132	uint64_t* end;
	133
	134	buf = ((uint64_t) arr->buf) + (index 2);
	135	src = buf + (count * 2);
	136	end = ((uint64_t) arr->buf) + (arr->used 2);
	137
	138	while( src != end )
	139	{
	140	buf++ = src++;
	141	buf++ = src++;
	142	}
	143	#else
129	144	uint32_t* buf;
130	145	uint32_t* src;
…	…
142	157	buf++ = src++;
143	158	}
	159	#endif
144	160	}
145	161	else
…	…
147	163	char* buf;
148	164	buf = arr->charArray + (elemSize * index);
149		memMove( buf, buf + elemSize, elemSize * (arr->used - index) );
	165	memMove( buf, buf + (elemSize * count),
	166	elemSize * (arr->used - index - count) );
150	167	}
151	168

r1	r167
131	131	else if( elemSize == 16 )
132	132	{
	133	#if __WORDSIZE == 64
	134	uint64_t* buf;
	135	uint64_t* src;
	136	uint64_t* end;
	137
	138	buf = ((uint64_t) arr->ptr.i) + (index 2);
	139	src = buf + (count * 2);
	140	end = ((uint64_t) arr->ptr.i) + (arr->used 2);
	141
	142	while( src != end )
	143	{
	144	buf++ = src++;
	145	buf++ = src++;
	146	}
	147	#else
133	148	uint32_t* buf;
134	149	uint32_t* src;
…	…
146	161	buf++ = src++;
147	162	}
	163	#endif
148	164	}
149	165	else
…	…
151	167	char* buf;
152	168	buf = arr->ptr.c + (elemSize * index);
153		memMove( buf, buf + elemSize, elemSize * (arr->used - index) );
	169	memMove( buf, buf + (elemSize * count),
	170	elemSize * (arr->used - index - count) );
154	171	}
155	172

r166	r167
142	142	if( ur_stringSlice( cell, &cpA, &cpB ) )
143	143	{
144		~~int count;~~
145	144	int size;
146	145	UBinary* bin;
147	146
148		count = cpB - cpA;
149		size = count * ur_encCharSize( cell );
	147	size = cpB - cpA;
150	148	binN = ur_makeBinary( size );
151	149	if( size )
…	…
153	151	bin = ur_binPtr( binN );
154	152	memCpy( bin->ptr.b, cpA, size );
155		bin->used = ~~count~~;
	153	bin->used = size;
156	154	}
157	155	}