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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=80006b0eb062a45479d109796df14c13ca7c5785
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

80006b0 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    SPOOLSS: Try to avoid an infinite loop.
    
    Use tvb_reported_length_remaining in dissect_spoolss_uint16uni. Make
    sure our offset always increments in dissect_spoolss_keybuffer.
    
    Conflicts:
    	epan/dissectors/packet-dcerpc-spoolss.c
    
    Change-Id: I7017c9685bb2fa27161d80a03b8fca4ef630e793
    Reviewed-on: https://code.wireshark.org/review/14687
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit b4d16b4495b732888e12baf5b8a7e9bf2665e22b)
    Reviewed-on: https://code.wireshark.org/review/15248
    (cherry picked from commit 9753ea8db4ea2caeb3365e842e904cbe5681b79e)
    Reviewed-on: https://code.wireshark.org/review/15249
    

Actions performed:

    from  5a43a0c   Don't assume packets will be no larger than ISERIES_MAX_PACKET_LEN.
    adds  80006b0   SPOOLSS: Try to avoid an infinite loop.


Summary of changes:
 epan/dissectors/packet-dcerpc-spoolss.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)