Changes in / [3dcc878:61d21e5b]
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
irc_im.c
r3dcc878 r61d21e5b 235 235 } else { 236 236 /* Modules can swallow messages. */ 237 goto cleanup;237 return TRUE; 238 238 } 239 239 } … … 250 250 wrapped = word_wrap(msg, 425); 251 251 irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix); 252 252 253 g_free(wrapped); 253 254 cleanup:255 254 g_free(prefix); 256 255 g_free(msg); … … 292 291 293 292 irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL); 294 295 g_string_free(msg, TRUE);296 293 297 294 return TRUE; … … 698 695 irc_t *irc = bee->ui_data; 699 696 irc_channel_t *ic = c->ui_data, *oic; 700 char *stripped, *full_name; 701 gsize bytes_written; 697 char stripped[MAX_NICK_LENGTH + 1], *full_name; 702 698 703 699 if (ic == NULL) { … … 710 706 } 711 707 712 stripped = g_convert_with_fallback(name, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL); 713 if (bytes_written > MAX_NICK_LENGTH) { 714 stripped[MAX_NICK_LENGTH] = '\0'; 715 } 716 708 strncpy(stripped, name, MAX_NICK_LENGTH); 709 stripped[MAX_NICK_LENGTH] = '\0'; 717 710 irc_channel_name_strip(stripped); 718 711 if (set_getbool(&bee->set, "lcnicks")) { … … 721 714 722 715 if (stripped[0] == '\0') { 723 g_free(stripped);724 716 return FALSE; 725 717 } 726 718 727 719 full_name = g_strdup_printf("#%s", stripped); 728 g_free(stripped);729 720 if ((oic = irc_channel_by_name(irc, full_name))) { 730 721 char *type, *chat_type; -
lib/ssl_gnutls.c
r3dcc878 r61d21e5b 124 124 125 125 if (conn->fd < 0) { 126 g_free(conn->hostname);127 126 g_free(conn); 128 127 return NULL; … … 315 314 if (source == -1) { 316 315 conn->func(conn->data, 0, NULL, cond); 317 g_free(conn->hostname);318 316 g_free(conn); 319 317 return FALSE; … … 357 355 conn->func(conn->data, 0, NULL, cond); 358 356 359 ssl_disconnect(conn); 357 gnutls_deinit(conn->session); 358 closesocket(conn->fd); 359 360 g_free(conn); 360 361 } 361 362 } else { … … 363 364 conn->func(conn->data, stver, NULL, cond); 364 365 365 ssl_disconnect(conn); 366 gnutls_deinit(conn->session); 367 closesocket(conn->fd); 368 369 g_free(conn); 366 370 } else { 367 371 /* For now we can't handle non-blocking perfectly everywhere... */ -
otr.c
r3dcc878 r61d21e5b 287 287 void otr_irc_free(irc_t *irc) 288 288 { 289 set_t *s;290 289 otr_t *otr = irc->otr; 291 290 … … 293 292 b_event_remove(otr->timer); 294 293 otrl_userstate_free(otr->us); 295 296 s = set_find(&irc->b->set, "otr_policy");297 g_slist_free(s->eval_data);298 299 294 if (otr->keygen) { 300 295 kill(otr->keygen, SIGTERM); … … 439 434 ic->acc->user, ic->acc->prpl->name, iu->bu->handle, msg, &newmsg, 440 435 &tlvs, NULL, NULL, NULL); 441 442 if (tlvs) {443 otrl_tlv_free(tlvs);444 }445 436 446 437 if (ignore_msg) { … … 481 472 /* libotr wants us to replace our message */ 482 473 /* NB: caller will free old msg */ 483 msg = st ? NULL :g_strdup(otrmsg);474 msg = g_strdup(otrmsg); 484 475 otrl_message_free(otrmsg); 485 476 } … … 1334 1325 1335 1326 log_message(LOGLVL_INFO, "otr: %s", msg); 1336 1337 g_free(msg);1338 1327 } 1339 1328 … … 2086 2075 } 2087 2076 } 2077 2078 /* vim: set noet ts=4 sw=4: */ -
protocols/jabber/jabber_util.c
r3dcc878 r61d21e5b 566 566 567 567 if ((s = strchr(jid, '=')) == NULL) { 568 g_free(jid);569 568 return NULL; 570 569 } -
protocols/msn/msn_util.c
r3dcc878 r61d21e5b 174 174 }; 175 175 176 static void msn_buddy_ask_ free(void *data)176 static void msn_buddy_ask_yes(void *data) 177 177 { 178 178 struct msn_buddy_ask_data *bla = data; 179 180 msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL); 181 182 imcb_ask_add(bla->ic, bla->handle, NULL); 179 183 180 184 g_free(bla->handle); … … 183 187 } 184 188 185 static void msn_buddy_ask_ yes(void *data)189 static void msn_buddy_ask_no(void *data) 186 190 { 187 191 struct msn_buddy_ask_data *bla = data; 188 192 189 msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL);190 191 imcb_ask_add(bla->ic, bla->handle, NULL);192 193 msn_buddy_ask_free(bla);194 }195 196 static void msn_buddy_ask_no(void *data)197 {198 struct msn_buddy_ask_data *bla = data;199 200 193 msn_buddy_list_add(bla->ic, MSN_BUDDY_BL, bla->handle, bla->realname, NULL); 201 194 202 msn_buddy_ask_free(bla); 195 g_free(bla->handle); 196 g_free(bla->realname); 197 g_free(bla); 203 198 } 204 199 … … 221 216 "The user %s (%s) wants to add you to his/her buddy list.", 222 217 bu->handle, bu->fullname); 223 224 imcb_ask_with_free(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no, msn_buddy_ask_free); 218 imcb_ask(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no); 225 219 } 226 220 -
protocols/nogaim.c
r3dcc878 r61d21e5b 498 498 }; 499 499 500 static void imcb_ask_ cb_free(void *data)500 static void imcb_ask_auth_cb_no(void *data) 501 501 { 502 502 struct imcb_ask_cb_data *cbd = data; 503 504 cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle); 503 505 504 506 g_free(cbd->handle); … … 506 508 } 507 509 508 static void imcb_ask_auth_cb_ no(void *data)510 static void imcb_ask_auth_cb_yes(void *data) 509 511 { 510 512 struct imcb_ask_cb_data *cbd = data; 511 513 512 cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);513 514 imcb_ask_cb_free(cbd);515 }516 517 static void imcb_ask_auth_cb_yes(void *data)518 {519 struct imcb_ask_cb_data *cbd = data;520 521 514 cbd->ic->acc->prpl->auth_allow(cbd->ic, cbd->handle); 522 515 523 imcb_ask_cb_free(cbd); 516 g_free(cbd->handle); 517 g_free(cbd); 524 518 } 525 519 … … 541 535 data->handle = g_strdup(handle); 542 536 query_add((irc_t *) ic->bee->ui_data, ic, s, 543 imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, imcb_ask_cb_free, data); 544 545 g_free(s); 537 imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, g_free, data); 538 } 539 540 541 static void imcb_ask_add_cb_no(void *data) 542 { 543 g_free(((struct imcb_ask_cb_data*) data)->handle); 544 g_free(data); 546 545 } 547 546 … … 552 551 cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL); 553 552 554 imcb_ask_ cb_free(data);553 imcb_ask_add_cb_no(data); 555 554 } 556 555 557 556 void imcb_ask_add(struct im_connection *ic, const char *handle, const char *realname) 558 557 { 559 struct imcb_ask_cb_data *data ;558 struct imcb_ask_cb_data *data = g_new0(struct imcb_ask_cb_data, 1); 560 559 char *s; 561 560 … … 565 564 } 566 565 567 data = g_new0(struct imcb_ask_cb_data, 1);568 569 566 s = g_strdup_printf("The user %s is not in your buddy list yet. Do you want to add him/her now?", handle); 570 567 … … 572 569 data->handle = g_strdup(handle); 573 570 query_add((irc_t *) ic->bee->ui_data, ic, s, 574 imcb_ask_add_cb_yes, imcb_ask_cb_free, imcb_ask_cb_free, data); 575 576 g_free(s); 571 imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data); 577 572 } 578 573 -
storage_xml.c
r3dcc878 r61d21e5b 128 128 } 129 129 } else { 130 g_free(pass_cr);131 g_free(password);132 130 return XT_ABORT; 133 131 }
Note: See TracChangeset
for help on using the changeset viewer.