Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-1.12 53c01b1e: Treat CR-LF at the end of a line like

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 14 Jul 2014 18:27:29 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=53c01b1e21bdad8242f1294109bb53f6b978b483
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

53c01b1e by Guy Harris (guy@xxxxxxxxxxxx):

    Treat CR-LF at the end of a line like LF.
    
    That way, if we're reading a Windows-format file on UN*X, we handle it
    the same way we'd handle a UN*X-format file.
    
    This handles bug 10272 for the preference file and the "recent" files;
    there are other configuration files that may need code changes as well.
    
    Change-Id: Iec15a8fac276929ce8b53ae16070e9f2855f574c
    Reviewed-on: https://code.wireshark.org/review/3042
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 338369ec2f89b47729df4b56ccf8fa3eab4ea270)
    Reviewed-on: https://code.wireshark.org/review/3043
    

Actions performed:

    from  a01be9b   dtls: fix faulty offsets and tvbuff references
    adds  53c01b1e  Treat CR-LF at the end of a line like LF.


Summary of changes:
 epan/prefs.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)