mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep strings and arrays in the buffer when demarshalling

Browse Source 
Avoids the malloc+copy, and is a step towards using the closure for
marshalling too.
This commit is contained in:
Kristian Høgsberg 2010-09-07 15:51:41 -04:00
parent de0fa3bc64
commit 6c7c7a909a
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
connection.c
View File

@ -403,6 +403,7 @@ wl_connection_demarshal(struct wl_connection *connection,
const struct wl_message *message) const struct wl_message *message)
{ {
uint32_t *p, *next, *end, length; uint32_t *p, *next, *end, length;
char *extra;
int i, count; int i, count;
struct wl_object *object; struct wl_object *object;
struct wl_closure *closure = &connection->closure; struct wl_closure *closure = &connection->closure;
@ -428,6 +429,7 @@ wl_connection_demarshal(struct wl_connection *connection,
wl_connection_copy(connection, closure->buffer, size); wl_connection_copy(connection, closure->buffer, size);
p = &closure->buffer[2]; p = &closure->buffer[2];
end = (uint32_t *) ((char *) (p + size)); end = (uint32_t *) ((char *) (p + size));
extra = (char *) end;
for (i = 2; i < count; i++) { for (i = 2; i < count; i++) {
if (p + 1 > end) { if (p + 1 > end) {
printf("message too short, " printf("message too short, "
@ -459,12 +461,7 @@ wl_connection_demarshal(struct wl_connection *connection,
if (length == 0) { if (length == 0) {
closure->values[i].string = NULL; closure->values[i].string = NULL;
} else { } else {
closure->values[i].string = malloc(length); closure->values[i].string = (char *) p;
if (closure->values[i].string == NULL) {
errno = ENOMEM;
goto err;
}
memcpy(closure->values[i].string, p, length);
if (closure->values[i].string[length - 1] != '\0') { if (closure->values[i].string[length - 1] != '\0') {
printf("string not nul-terminated, " printf("string not nul-terminated, "
"message %s(%s)\n", "message %s(%s)\n",
@ -514,16 +511,11 @@ wl_connection_demarshal(struct wl_connection *connection,
goto err; goto err;
} }
closure->values[i].array = closure->values[i].array = (struct wl_array *) extra;
malloc(length + sizeof *closure->values[i].array); extra += sizeof *closure->values[i].array;
if (closure->values[i].array == NULL) {
errno = ENOMEM;
goto err;
}
closure->values[i].array->size = length; closure->values[i].array->size = length;
closure->values[i].array->alloc = 0; closure->values[i].array->alloc = 0;
closure->values[i].array->data = closure->values[i].array + 1; closure->values[i].array->data = p;
memcpy(closure->values[i].array->data, p, length);
p = next; p = next;
break; break;
case 'h': case 'h':
@ -615,16 +607,4 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target)
void void
wl_closure_destroy(struct wl_closure *closure) wl_closure_destroy(struct wl_closure *closure)
{ {
int i;
for (i = 2; i < closure->count; i++) {
switch (closure->message->signature[i - 2]) {
case 's':
free(closure->values[i].string);
break;
case 'a':
free(closure->values[i].array);
break;
}
}
} }