gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 08:26:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

iarray coding fixes for DO

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34834 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-02-27 20:35:37 +00:00
parent 956d76294e
commit 717533effd
2 changed files with 88 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -6,6 +6,7 @@
original versionallowed for variable encodings of integral types in
archived data, but not for the count of the nuymber of items in the
array :-(
* Source/NSPortCoder.m: Similar fixes for encoding/decoding arrays.
2012-02-27 Fred Kiefer <FredKiefer@gmx.de>

96
Source/NSPortCoder.m
View file

@ -433,14 +433,47 @@ static IMP _xRefImp; /* Serialize a crossref. */
count: (NSUInteger)expected
at: (void*)buf
{
unsigned int i;
int offset = 0;
int size = objc_sizeof_type(type);
NSUInteger i;
NSUInteger offset = 0;
unsigned size = objc_sizeof_type(type);
unsigned char info;
unsigned count;
NSUInteger count;
(*_dTagImp)(_src, dTagSel, &info, 0, &_cursor);
(*_dDesImp)(_src, dDesSel, &count, @encode(unsigned), &_cursor, nil);
if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1))
{
uint8_t c;
/* Unpack variable length count.
*/
count = 0;
for (;;)
{
if (count * 128 < count)
{
[NSException raise: NSInternalInconsistencyException
format: @"overflow in array count"];
}
count *= 128;
(*_dDesImp)(self, dDesSel, &c, @encode(uint8_t), &_cursor, nil);
if (c & 128)
{
count += (c & 127);
}
else
{
count += c;
break;
}
}
}
else
{
unsigned c;
(*_dDesImp)(self, dDesSel, &c, @encode(unsigned), &_cursor, nil);
count = c;
}
if (info != _GSC_ARY_B)
{
[NSException raise: NSInternalInconsistencyException
@ -1101,11 +1134,33 @@ static IMP _xRefImp; /* Serialize a crossref. */
count: (NSUInteger)count
at: (const void*)buf
{
unsigned i;
unsigned offset = 0;
NSUInteger i;
unsigned c = count;
uint8_t bytes[20];
uint8_t *bytePtr = 0;
uint8_t byteCount = 0;
NSUInteger offset = 0;
unsigned size = objc_sizeof_type(type);
uchar info;
/* The array count is encoded as a sequence of bytes containing 7bits of
* data and using the eighth (top) bit to indicate that there are more
* bytes in the sequence.
*/
if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1))
{
NSUInteger tmp = count;
bytes[sizeof(bytes) - ++byteCount] = (uint8_t)(tmp % 128);
tmp /= 128;
while (tmp > 0)
{
bytes[sizeof(bytes) - ++byteCount] = (uint8_t)(128 | (tmp % 128));
tmp /= 128;
}
bytePtr = &bytes[sizeof(bytes) - byteCount];
}
switch (*type)
{
case _C_ID: info = _GSC_NONE; break;
@ -1133,7 +1188,19 @@ static IMP _xRefImp; /* Serialize a crossref. */
if (_initialPass == NO)
{
(*_eTagImp)(_dst, eTagSel, _GSC_ARY_B);
(*_eSerImp)(_dst, eSerSel, &count, @encode(unsigned), nil);
if (0 == byteCount)
{
(*_eSerImp)(_dst, eSerSel, &c, @encode(unsigned), nil);
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_eSerImp)
(_dst, eSerSel, bytePtr + i, @encode(uint8_t), nil);
}
}
}
for (i = 0; i < count; i++)
{
@ -1144,7 +1211,18 @@ static IMP _xRefImp; /* Serialize a crossref. */
else if (_initialPass == NO)
{
(*_eTagImp)(_dst, eTagSel, _GSC_ARY_B);
(*_eSerImp)(_dst, eSerSel, &count, @encode(unsigned), nil);
if (0 == byteCount)
{
(*_eSerImp)(_dst, eSerSel, &c, @encode(unsigned), nil);
}
else
{
i = byteCount;
for (i = 0; i < byteCount; i++)
{
(*_eSerImp)(_dst, eSerSel, bytePtr + i, @encode(uint8_t), nil);
}
}
(*_eTagImp)(_dst, eTagSel, info);
for (i = 0; i < count; i++)