[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6a91b56ac7f64f1cc11edecf9f2807b3fe8a64c3
Submitter: "Stig Bjørlykke <stig@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

6a91b56 by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    extcap: Read stderr on extcap error without an infinite loop
    
    Check if data is available on stderr before doing a blocking read() to
    avoid an infinite read loop when having less data than STDERR_BUFFER_SIZE.
    
    Append data instead of overwrite when doing multiple read() to fetch
    available data.
    
    This is a regression from g6a949ed155.
    
    Bug: 15205
    Change-Id: I84b232aeafb6123f77f3f5d48bbe89326fe7eb0f
    Reviewed-on: https://code.wireshark.org/review/30209
    Petri-Dish: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
    (cherry picked from commit f86d6203a93f2b84b771c2d21e8a6dd24adfdca8)
    Reviewed-on: https://code.wireshark.org/review/30214
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    

Actions performed:

    from  bbcfba4   macos-setup.sh: fix missing bcg729 version check
     add  6a91b56   extcap: Read stderr on extcap error without an infinite loop


Summary of changes:
 extcap.c         |  2 +-
 wsutil/ws_pipe.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)