1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Fixed possible NULL pointer references when offline

This commit is contained in:
James Booth 2012-10-24 02:18:20 +01:00
parent 8322c48d3e
commit e49bea4d6b
3 changed files with 27 additions and 14 deletions

View File

@ -765,6 +765,8 @@ _cmd_tiny(const char * const inp, struct cmd_help_t help)
free(url);
} else if (win_in_chat()) {
char *tiny = tinyurl_get(url);
if (tiny != NULL) {
char *recipient = win_get_recipient();
jabber_send(tiny, recipient);
@ -776,6 +778,10 @@ _cmd_tiny(const char * const inp, struct cmd_help_t help)
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
free(tiny);
} else {
cons_bad_show("Couldn't get tinyurl.");
}
free(url);
} else {
cons_bad_command(inp);

View File

@ -53,9 +53,12 @@ release_get_latest()
curl_easy_perform(handle);
curl_easy_cleanup(handle);
if (output.buffer != NULL) {
output.buffer[output.size++] = '\0';
return output.buffer;
} else {
return NULL;
}
}
static size_t

View File

@ -60,10 +60,14 @@ tinyurl_get(char *url)
curl_easy_perform(handle);
curl_easy_cleanup(handle);
output.buffer[output.size++] = '\0';
g_string_free(full_url, TRUE);
if (output.buffer != NULL) {
output.buffer[output.size++] = '\0';
return output.buffer;
} else {
return NULL;
}
}
static size_t