SilcBuffer buffer;
SilcIdType type;
unsigned short idlen;
- unsigned char *id;
+ unsigned char *id_data;
int ret;
+ void *id;
buffer = silc_buffer_alloc(len);
silc_buffer_pull_tail(buffer, SILC_BUFFER_END(buffer));
goto err;
ret = silc_buffer_unformat(buffer,
- SILC_STR_UI_XNSTRING_ALLOC(&id, idlen),
+ SILC_STR_UI_XNSTRING_ALLOC(&id_data, idlen),
SILC_STR_END);
if (ret == -1)
goto err;
silc_buffer_free(buffer);
- return silc_id_str2id(id, idlen, type);
+ id = silc_id_str2id(id_data, idlen, type);
+ silc_free(id_data);
+ return id;
err:
silc_buffer_free(buffer);
{
if (payload) {
silc_free(payload->id);
+ silc_free(payload);
}
}
new->argv_lens[i] = payload_len;
new->argv_types[i] = arg_type;
- if (payload_len > buffer->len)
+ if (payload_len > buffer->len - 3)
break;
/* Get argument data */
silc_free(payload->argv[i]);
silc_free(payload->argv);
+ silc_free(payload->argv_lens);
+ silc_free(payload->argv_types);
silc_free(payload);
}
}