qulogic/pidgin

Merged TALOS-CAN-0137
release-2.x.y
2016-06-12, Gary Kramlich
5ae57760ca10
Parents 89b326ceca25f3625aef3192
Children 048d46315e91
Merged TALOS-CAN-0137
2 files changed, 4 insertions(+), 1 deletions(-)
  • +2 -0
    ChangeLog
  • +2 -1
    libpurple/protocols/mxit/protocol.c
    • --- a/ChangeLog Sun Jun 12 22:15:07 2016 -0500
    +++ b/ChangeLog Sun Jun 12 22:17:08 2016 -0500
    @@ -35,6 +35,8 @@
    read. Discovered by Yves Younan of Cisco Talos (TALOS-CAN-0134)
    * Fixed multiple remote buffer overflows. Discovered by Yves Younan of
    Cisco Talos. (TALOS-CAN-0136)
    + * Fixed a remote NULL pointer dereference. Discovered by Yves Younan of
    + Cisco Talos (TALOS-CAN-0137)
    version 2.10.12 (12/31/15):
    General:
    --- a/libpurple/protocols/mxit/protocol.c Sun Jun 12 22:15:07 2016 -0500
    +++ b/libpurple/protocols/mxit/protocol.c Sun Jun 12 22:17:08 2016 -0500
    @@ -2662,7 +2662,8 @@
    /* new record */
    if ( packet.rcount == 1 ) {
    /* packet command */
    - packet.cmd = atoi( packet.records[0]->fields[0]->data );
    + if ( packet.records[0]->fcount > 0 )
    + packet.cmd = atoi( packet.records[0]->fields[0]->data );
    }
    else if ( packet.rcount == 2 ) {
    /* special case: binary multimedia packets should not be parsed here */