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);
unsigned char *id_data;
unsigned int len;
- SILC_LOG_DEBUG(("Parsing ID payload"));
+ SILC_LOG_DEBUG(("Encoding %s ID payload",
+ type == SILC_ID_CLIENT ? "Client" :
+ type == SILC_ID_SERVER ? "Server" : "Channel"));
id_data = silc_id_id2str(id, type);
len = silc_id_get_len(type);
{
if (payload) {
silc_free(payload->id);
+ silc_free(payload);
}
}
SilcIdType silc_id_payload_get_type(SilcIDPayload payload)
{
- return payload->type;
+ return payload ? payload->type : 0;
}
/* Get ID */
void *silc_id_payload_get_id(SilcIDPayload payload)
{
- return silc_id_str2id(payload->id, payload->len, payload->type);
+ return payload ? silc_id_str2id(payload->id, payload->len,
+ payload->type) : NULL;
}
/* Get raw ID data. Data is duplicated. */
unsigned char *silc_id_payload_get_data(SilcIDPayload payload)
{
- unsigned char *ret = silc_calloc(payload->len, sizeof(*ret));
+ unsigned char *ret;
+
+ if (!payload)
+ return NULL;
+
+ ret = silc_calloc(payload->len, sizeof(*ret));
memcpy(ret, payload->id, payload->len);
return ret;
}
unsigned int silc_id_payload_get_len(SilcIDPayload payload)
{
- return payload->len;
+ return payload ? payload->len : 0;
}
/******************************************************************************
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);
}
}
unsigned int silc_argument_get_arg_num(SilcArgumentPayload payload)
{
- return payload->argc;
+ return payload ? payload->argc : 0;
}
/* Returns first argument from payload. */
unsigned char *silc_argument_get_first_arg(SilcArgumentPayload payload,
unsigned int *ret_len)
{
+ if (!payload)
+ return NULL;
+
payload->pos = 0;
if (ret_len)
unsigned char *silc_argument_get_next_arg(SilcArgumentPayload payload,
unsigned int *ret_len)
{
+ if (!payload)
+ return NULL;
+
if (payload->pos >= payload->argc)
return NULL;
{
int i;
+ if (!payload)
+ return NULL;
+
for (i = 0; i < payload->argc; i++)
if (payload->argv_types[i] == type)
break;