Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-15 09:46:34 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup code around tox ID/pk conversion functions

Browse Source
This commit is contained in:
jfreegman
2021-12-06 10:46:19 -05:00
parent afbd185222
commit e2c8497da9
6 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap.c
View File

@@ -381,8 +381,11 @@ static long long int extract_val_last_pinged(const char *s)
* Return number of bytes copied to key_buf on success.
* Return -1 on failure.
*/
static int extract_val_pk(const char *s, char *key_buf)
static int extract_val_pk(const char *s, char *key_buf, size_t buf_length)
{
if (buf_length < TOX_PUBLIC_KEY_SIZE * 2 + 1) {
return -1;
}
int key_len = char_find(0, s, '"');
@@ -445,13 +448,13 @@ static int extract_node(const char *line, struct Node *node)
}
char key_string[TOX_PUBLIC_KEY_SIZE * 2 + 1];
int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string);
int key_len = extract_val_pk(key_start + PK_JSON_KEY_LEN, key_string, sizeof(key_string));
if (key_len == -1) {
return -6;
}
if (hex_string_to_bin(key_string, key_len, node->key, TOX_PUBLIC_KEY_SIZE) == -1) {
if (tox_pk_string_to_bytes(key_string, key_len, node->key, sizeof(node->key)) == -1) {
return -6;
}