pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-03 00:03:12 +02:00
Code Activity

Fix crash in hashtable_get_string with "values" or "keys_values" when some values in hashtable are NULL

Browse Source
This commit is contained in:
Sebastien Helleu
2010-10-16 11:30:42 +02:00
parent 880163d784
commit eff0f9abdb
1 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-hashtable.c
+63 -42
View File
@@ -480,21 +480,28 @@ hashtable_compute_length_values_cb (void *data,
(void) key;
length = (int *)data;
switch (hashtable->type_values)
if (value)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
*length += strlen (str_int) + 1;
break;
case HASHTABLE_STRING:
*length += strlen ((char *)value) + 1;
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
*length += strlen (str_int) + 1;
break;
case HASHTABLE_STRING:
*length += strlen ((char *)value) + 1;
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
else
{
*length += strlen ("(null)");
}
}
@@ -567,21 +574,28 @@ hashtable_build_string_values_cb (void *data,
if (str[0])
strcat (str, ",");
switch (hashtable->type_values)
if (value)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
else
{
strcat (str, "(null)");
}
}
@@ -622,21 +636,28 @@ hashtable_build_string_keys_values_cb (void *data,
}
strcat (str, ":");
switch (hashtable->type_values)
if (value)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
switch (hashtable->type_values)
{
case HASHTABLE_INTEGER:
snprintf (str_int, sizeof (str_int), "%d", *((int *)value));
strcat (str, str_int);
break;
case HASHTABLE_STRING:
strcat (str, (char *)value);
break;
case HASHTABLE_POINTER:
case HASHTABLE_BUFFER:
case HASHTABLE_TIME:
case HASHTABLE_NUM_TYPES:
break;
}
}
else
{
strcat (str, "(null)");
}
}