2007-01-05 [colin] 2.6.1cvs108

	* src/common/quoted-printable.c
		Uh! Third fix :)

diff --git a/ChangeLog b/ChangeLog
index 9ce669a1e18f4a711d25bb9ed46fae00b4d9d2e7..95478af2d3a9fceb6bc4fef83a3aea085d230e13 100644 (file)
--- 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
 2007-01-05 [colin]     2.6.1cvs107
 
        * src/common/quoted-printable.c

diff --git a/PATCHSETS b/PATCHSETS
index 4805248038796ef3eabdee2bc2abd4be6ffaee7b..5ac40808e9837c6cf667b3af92a03a1e896df5dd 100644 (file)
--- 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.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 592b575125dc8fff0e2bb700a56ef0e555157191..85f540809b75e756226a7a64e0725b3cff0cb33f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=107
+EXTRA_VERSION=108

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index 4293f4b6ea6a0974d2a174ff099d3780f509c887..bf3cc89b8e344e1aa06d9fffdaa02a522215aac3 100644 (file)
--- 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 == '=') {
 
        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;
                                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;
                            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 == '=') {
 
        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;
                                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;
                            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) {
 
        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;
                                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++;
                                inp += 3;
                        } else {
                                *outp = *inp++;