Fix a few bugs

This commit is contained in:
Alex D. 2021-02-23 23:06:30 +00:00
parent 4ccfc377cd
commit b325599808
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
1 changed files with 8 additions and 6 deletions

View File

@ -104,14 +104,15 @@ uirc_malloc_message(const char* command, ...)
{
IRC_Message* ret;
assert(command != NULL);
if ((ret = malloc(sizeof(IRC_Capability))) != NULL) {
memset(ret, 0, sizeof(IRC_Capability));
if ((ret = malloc(sizeof(IRC_Message))) != NULL) {
memset(ret, 0, sizeof(IRC_Message));
if ((ret->command = malloc_string(command, strlen(command))) == NULL) {
uirc_free_message(ret);
return NULL;
}
return ret;
}
} else
return NULL;
va_list ap;
va_start(ap, command);
for (unsigned short i = 0; i < IRC_MAXARGS; i++) {
@ -119,12 +120,13 @@ uirc_malloc_message(const char* command, ...)
if ((carg = va_arg(ap, const char*)) != NULL) {
if ((ret->args[i] = malloc_string(carg, strlen(carg))) == NULL) {
uirc_free_message(ret);
return NULL;
ret = NULL;
}
}
}
va_end(ap);
return NULL;
return ret;
}
IRC_Buffer*