DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for variable serialization

Browse Source
This commit is contained in:
Pierre Pronchery 2012-12-04 00:45:04 +01:00
parent c0b6614cdf
commit d94e91275e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/variable.c
View File

@ -483,6 +483,7 @@ int variable_get_as(Variable * variable, VariableType type, void * result)
int variable_serialize(Variable * variable, Buffer * buffer, int type) int variable_serialize(Variable * variable, Buffer * buffer, int type)
{ {
size_t size = 0; size_t size = 0;
size_t offset;
void * p; void * p;
unsigned char u; unsigned char u;
uint32_t u32; uint32_t u32;
@ -525,21 +526,29 @@ int variable_serialize(Variable * variable, Buffer * buffer, int type)
p = variable->u.string; p = variable->u.string;
break; break;
} }
if(size == 0 && type != VT_NULL) if(size == 0 && variable->type != VT_NULL)
return -error_set_code(1, "Unable to serialize type %u", type); return -error_set_code(1, "Unable to serialize type %u", type);
if(type) if(type)
{ {
u = variable->type; u = variable->type;
if(buffer_set(buffer, sizeof(u), (char *)&u) != 0) if(buffer_set(buffer, sizeof(u), (char *)&u) != 0)
return -1; return -1;
if(type == VT_BUFFER) offset = sizeof(u);
return (buffer_set_data(buffer, sizeof(u), (char *)&u32, if(variable->type == VT_BUFFER)
sizeof(u32)) == 0 {
&& buffer_set_data(buffer, if(buffer_set_data(buffer, offset, (char *)&u32,
sizeof(u) + sizeof(u32), p, sizeof(u32)) != 0)
u32) == 0) ? 0 : -1; return -1;
return buffer_set_data(buffer, sizeof(u), p, size); offset += sizeof(u32);
}
return buffer_set_data(buffer, offset, p, size);
} }
else offset = 0;
return buffer_set(buffer, size, p); if(variable->type == VT_BUFFER)
{
if(buffer_set(buffer, sizeof(u32), (char *)&u32) != 0)
return -1;
offset += sizeof(u32);
}
return buffer_set_data(buffer, offset, p, size);
} }