diff options
| author | Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im> | 2013-04-28 15:24:41 +0200 |
|---|---|---|
| committer | Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im> | 2013-04-28 15:24:41 +0200 |
| commit | 76cd3c14c344a63863d57abba771c93c5b589556 (patch) | |
| tree | 6f81cc37632a1abffba62f5a88cef34147cf0d0a | |
| parent | 441487bfecfa18cf2b6132243c96771e65335d4a (diff) | |
| download | pidgin-76cd3c14c344a63863d57abba771c93c5b589556.tar.gz | |
Replace g_free with purple_str_wipe, correct line breaking
| -rw-r--r-- | libpurple/keyring.c | 4 | ||||
| -rw-r--r-- | libpurple/protocols/irc/msgs.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libpurple/keyring.c b/libpurple/keyring.c index 5b98e2cc49..dc7073dab4 100644 --- a/libpurple/keyring.c +++ b/libpurple/keyring.c @@ -105,7 +105,7 @@ purple_keyring_failed_import_free(PurpleKeyringFailedImport *import) g_free(import->keyring_id); g_free(import->mode); - g_free(import->data); + purple_str_wipe(import->data); g_free(import); } @@ -730,7 +730,7 @@ purple_keyring_export_password(PurpleAccount *account, const gchar **keyring_id, *keyring_id = import->keyring_id; *mode = import->mode; *data = g_strdup(import->data); - *destroy = g_free; + *destroy = purple_str_wipe; return TRUE; } } diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c index 9e07d7fc83..d6e11cb51a 100644 --- a/libpurple/protocols/irc/msgs.c +++ b/libpurple/protocols/irc/msgs.c @@ -1471,7 +1471,8 @@ irc_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret) const char *pw; size_t len; - pw = purple_connection_get_password(purple_account_get_connection(irc->account)); + pw = purple_connection_get_password(purple_account_get_connection( + irc->account)); if (!conn || !secret || id != SASL_CB_PASS) return SASL_BADPARAM; |