aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Fixed possible NULL pointer references when offline

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/command.c
View File

@ -765,17 +765,23 @@ _cmd_tiny(const char * const inp, struct cmd_help_t help)
free(url); free(url);
} else if (win_in_chat()) { } else if (win_in_chat()) {
char *tiny = tinyurl_get(url); char *tiny = tinyurl_get(url);
char *recipient = win_get_recipient();
jabber_send(tiny, recipient); if (tiny != NULL) {
char *recipient = win_get_recipient();
jabber_send(tiny, recipient);
if (prefs_get_chlog()) { if (prefs_get_chlog()) {
const char *jid = jabber_get_jid(); const char *jid = jabber_get_jid();
chat_log_chat(jid, recipient, tiny, OUT); chat_log_chat(jid, recipient, tiny, OUT);
}
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
free(tiny);
} else {
cons_bad_show("Couldn't get tinyurl.");
} }
win_show_outgoing_msg("me", recipient, tiny);
free(recipient);
free(tiny);
free(url); free(url);
} else { } else {
cons_bad_command(inp); cons_bad_command(inp);

9
src/release.c
View File

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

8
src/tinyurl.c
View File

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