From 1eb412c1d6a4e596b714053a063b5b949fc8b810 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 5 Jan 2007 07:08:53 +0000 Subject: [PATCH] 2007-01-05 [colin] 2.6.1cvs108 * src/common/quoted-printable.c Uh! Third fix :) --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/quoted-printable.c | 15 +++++++++------ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ce669a1e..95478af2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-05 [colin] 2.6.1cvs108 + + * src/common/quoted-printable.c + Uh! Third fix :) + 2007-01-05 [colin] 2.6.1cvs107 * src/common/quoted-printable.c diff --git a/PATCHSETS b/PATCHSETS index 480524803..5ac40808e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2215,3 +2215,4 @@ ( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/common/quoted-printable.c; ) > 2.6.1cvs105.patchset ( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/quoted-printable.c; ) > 2.6.1cvs106.patchset ( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/quoted-printable.c; ) > 2.6.1cvs107.patchset +( cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/common/quoted-printable.c; ) > 2.6.1cvs108.patchset diff --git a/configure.ac b/configure.ac index 592b57512..85f540809 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=107 +EXTRA_VERSION=108 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c index 4293f4b6e..bf3cc89b8 100644 --- a/src/common/quoted-printable.c +++ b/src/common/quoted-printable.c @@ -90,9 +90,10 @@ gint qp_decode_line(gchar *str) while (*inp != '\0') { if (*inp == '=') { - if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') + if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') { inp += 3; - else if (inp[1] && inp[2] && + continue; + } else if (inp[1] && inp[2] && get_hex_value((guchar *)outp, inp[1], inp[2]) == TRUE) { inp += 3; @@ -121,9 +122,10 @@ gint qp_decode_const(gchar *out, gint avail, const gchar *str) while (*inp != '\0' && avail > 0) { if (*inp == '=') { - if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') + if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') { inp += 3; - else if (inp[1] && inp[2] && + continue; + } else if (inp[1] && inp[2] && get_hex_value((guchar *)outp, inp[1], inp[2]) == TRUE) { inp += 3; @@ -156,9 +158,10 @@ gint qp_decode_q_encoding(guchar *out, const gchar *in, gint inlen) while (inp - in < inlen && *inp != '\0') { if (*inp == '=' && inp + 3 - in <= inlen) { - if (inp[1] == '0' && inp[2] == '0') + if (inp[1] && inp[2] && inp[1] == '0' && inp[2] == '0') { inp += 3; - else if (get_hex_value(outp, inp[1], inp[2]) == TRUE) { + continue; + } else if (get_hex_value(outp, inp[1], inp[2]) == TRUE) { inp += 3; } else { *outp = *inp++; -- 2.25.1