Wireshark-commits: [Wireshark-commits] master-1.10 de26594: RTP player: don't crash when drawing ch
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 2 Mar 2015 12:17:22 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=de26594e3d38591dd81d43b6276b1e6055419677
Submitter: Jeff Morriss (jeff.morriss.ws@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

de26594 by Jeff Morriss (jeff.morriss.ws@xxxxxxxxx):

    RTP player: don't crash when drawing channel graphs for very long calls.
    
    X11 can't handle pixmaps more than 32k pixels wide so don't try to feed it
    one.  This avoids crashes with the complaint "BadAlloc (insufficient
    resources for operation)".  Instead we simply truncate the graph (and tell the
    user).  Do this in a way that shows the user the empty portion of the graph.
    
    Hopefully the Qt port can fix this properly.
    
    Note: the bug report says that MacOS is not affected but it should be.  So
    apply this fix for all on-Windows systems.
    
    Bug: 2630
    Change-Id: I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a
    Reviewed-on: https://code.wireshark.org/review/7464
    Petri-Dish: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 701be1f052922aa00288a8c28c42ee358587b7fb)
    Reviewed-on: https://code.wireshark.org/review/7479
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>
    

Actions performed:

    from  891ca95   [Automatic manuf, services and enterprise-numbers update for 2015-03-01]
    adds  de26594   RTP player: don't crash when drawing channel graphs for very long calls.


Summary of changes:
 ui/gtk/rtp_player.c |   28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)