[Pidgin] #6343: OIMs broken in msnp15 because of the wrap at 76 chars.

[Pidgin]

#6343: OIMs broken in msnp15 because of the wrap at 76 chars.
----------------------+-----------------------------------------------------
  Reporter:  Dimmuxx  |       Owner:  khc             
      Type:  defect   |      Status:  new             
  Priority:  minor    |   Milestone:                  
 Component:  MSN      |     Version:  2.4.3           
Resolution:           |    Keywords:  msnp15 oim crash
   Pending:  0        |  
----------------------+-----------------------------------------------------
Comment (by khc):

 the crash is probably because MSN_OIM_MSG_TEMPLATE defined 3 params but
 only 2 are passed. can you try this:


 {{{
 --- libpurple/protocols/msn/oim.c
 0d64864aa018bd11de963bbbc973f0c856048dac
 +++ libpurple/protocols/msn/oim.c
 2052f01081c4575e8d311ffdb22eff4a2995f424
 @@ -274,22 +274,27 @@ msn_oim_msg_to_str(MsnOim *oim, const ch
         char *oim_base64;
         char *c;
         int len;
 +       size_t base64_len;

         purple_debug_info("msn", "Encoding OIM Message...\n");
         len = strlen(body);
         c = oim_base64 = purple_base64_encode((const guchar *)body, len);
 +       base64_len = strlen(oim_base64);
         purple_debug_info("msn", "Encoded base64 body:{%s}\n",
 oim_base64);

         oim_body = g_string_new(NULL);
         g_string_printf(oim_body, MSN_OIM_MSG_TEMPLATE,
 -                       oim->run_id, oim->send_seq);
 +               oim->run_id, oim->send_seq, "");

 -       len = ((len / 3) + 1) * 4 - 76;
 -       while ((c - oim_base64) < len) {
 -               g_string_append_len(oim_body, c, 76);
 +#define OIM_LINE_LEN 76
 +       while (base64_len > OIM_LINE_LEN) {
 +               g_string_append_len(oim_body, c, OIM_LINE_LEN);
                 g_string_append_c(oim_body, '\n');
 -               c += 76;
 +               c += OIM_LINE_LEN;
 +               base64_len -= OIM_LINE_LEN;
         }
 +#undef OIM_LINE_LEN
 +
         g_string_append(oim_body, c);

         g_free(oim_base64);

 }}}

-- 
Ticket URL: <http://developer.pidgin.im/ticket/6343#comment:1>
Pidgin <http://pidgin.im>
Pidgin