Credit John Beck's fixes.

[~andy/fetchmail] / fetchmail-SA-2010-02.txt

diff --git a/fetchmail-SA-2010-02.txt b/fetchmail-SA-2010-02.txt
index 61c5fc6ea547a947386265c58400e68514179279..f1c17b75b3368f29b22745f8583d49da10818d96 100644 (file)
--- a/fetchmail-SA-2010-02.txt
+++ b/fetchmail-SA-2010-02.txt
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 fetchmail-SA-2010-02: Denial of service in debug mode w/ multichar locales
 
 Topics:                Denial of service in debug output
@@ -102,15 +105,17 @@ A. Copyright, License and Warranty
 (C) Copyright 2010 by Matthias Andree, <matthias.andree@gmx.de>.
 Some rights reserved.
 
-This work is licensed under the Creative Commons
-Attribution-Noncommercial-No Derivative Works 3.0 Germany License.
+This work is licensed under the
+Creative Commons Attribution-NoDerivs 3.0 Germany License (CC BY-ND 3.0).
+
 To view a copy of this license, visit
-http://creativecommons.org/licenses/by-nc-nd/3.0/de/ or send a letter to
+http://creativecommons.org/licenses/by-nd/3.0/de/deed.en
+or send a letter to:
 
 Creative Commons
-171 Second Street
-Suite 300
-SAN FRANCISCO, CALIFORNIA 94105
+444 Castro Street
+Suite 900
+MOUNTAIN VIEW, CALIFORNIA 94041
 USA
 
 
@@ -131,7 +136,7 @@ so try this if the patch does not apply.
 
 diff --git a/rfc822.c b/rfc822.c
 index 6f2dbf3..dbcda32 100644
---- a/rfc822.c
+- --- a/rfc822.c
 +++ b/rfc822.c
 @@ -25,6 +25,7 @@ MIT license.  Compile with -DMAIN to build the demonstrator.
  #include  <stdlib.h>
@@ -145,9 +150,9 @@ index 6f2dbf3..dbcda32 100644
      }
  
  #ifndef MAIN
--    if (outlevel >= O_DEBUG)
--      report_build(stdout, GT_("About to rewrite %.*s...\n"),
--                      (int)BEFORE_EOL(buf), buf);
+- -    if (outlevel >= O_DEBUG)
+- -    report_build(stdout, GT_("About to rewrite %.*s...\n"),
+- -                    (int)BEFORE_EOL(buf), buf);
 +    if (outlevel >= O_DEBUG) {
 +      report_build(stdout, GT_("About to rewrite %s...\n"), (cp = sdump(buf, BEFORE_EOL(buf))));
 +      xfree(cp);
@@ -159,9 +164,9 @@ index 6f2dbf3..dbcda32 100644
      }
  
  #ifndef MAIN
--    if (outlevel >= O_DEBUG)
--      report_complete(stdout, GT_("...rewritten version is %.*s.\n"),
--                      (int)BEFORE_EOL(buf), buf);
+- -    if (outlevel >= O_DEBUG)
+- -    report_complete(stdout, GT_("...rewritten version is %.*s.\n"),
+- -                    (int)BEFORE_EOL(buf), buf);
 +    if (outlevel >= O_DEBUG) {
 +      report_complete(stdout, GT_("...rewritten version is %s.\n"),
 +                      (cp = sdump(buf, BEFORE_EOL(buf))));
@@ -173,7 +178,7 @@ index 6f2dbf3..dbcda32 100644
      return(buf);
 diff --git a/uid.c b/uid.c
 index fdc6f5d..9a62ee2 100644
---- a/uid.c
+- --- a/uid.c
 +++ b/uid.c
 @@ -20,6 +20,7 @@
  
@@ -187,8 +192,8 @@ index fdc6f5d..9a62ee2 100644
            {
                report_build(stdout, GT_("Old UID list from %s:"), 
                             ctl->server.pollname);
--              for (idp = ctl->oldsaved; idp; idp = idp->next)
--                  report_build(stdout, " %s", idp->id);
+- -            for (idp = ctl->oldsaved; idp; idp = idp->next)
+- -                report_build(stdout, " %s", idp->id);
 +              for (idp = ctl->oldsaved; idp; idp = idp->next) {
 +                  char *t = sdump(idp->id, strlen(idp->id));
 +                  report_build(stdout, " %s", t);
@@ -201,8 +206,8 @@ index fdc6f5d..9a62ee2 100644
        if (uidlcount)
        {
            report_build(stdout, GT_("Scratch list of UIDs:"));
--          for (idp = scratchlist; idp; idp = idp->next)
--              report_build(stdout, " %s", idp->id);
+- -        for (idp = scratchlist; idp; idp = idp->next)
+- -            report_build(stdout, " %s", idp->id);
 +          for (idp = scratchlist; idp; idp = idp->next) {
 +              char *t = sdump(idp->id, strlen(idp->id));
 +              report_build(stdout, " %s", t);
@@ -215,8 +220,8 @@ index fdc6f5d..9a62ee2 100644
            report_build(stdout, GT_("Merged UID list from %s:"), ctl->server.pollname);
        else
            report_build(stdout, GT_("New UID list from %s:"), ctl->server.pollname);
--      for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next)
--          report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
+- -    for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next)
+- -        report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
 +      for (idp = dofastuidl ? ctl->oldsaved : ctl->newsaved; idp; idp = idp->next) {
 +          char *t = sdump(idp->id, strlen(idp->id));
 +          report_build(stdout, " %s = %d", t, idp->val.status.mark);
@@ -229,8 +234,8 @@ index fdc6f5d..9a62ee2 100644
        /* this is now a merged list! the mails which were seen in this
         * poll are marked here. */
        report_build(stdout, GT_("Merged UID list from %s:"), ctl->server.pollname);
--      for (idp = ctl->oldsaved; idp; idp = idp->next)
--          report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
+- -    for (idp = ctl->oldsaved; idp; idp = idp->next)
+- -        report_build(stdout, " %s = %d", idp->id, idp->val.status.mark);
 +      for (idp = ctl->oldsaved; idp; idp = idp->next) {
 +          char *t = sdump(idp->id, strlen(idp->id));
 +          report_build(stdout, " %s = %d", t, idp->val.status.mark);
@@ -239,3 +244,10 @@ index fdc6f5d..9a62ee2 100644
        if (!idp)
            report_build(stdout, GT_(" <empty>"));
        report_complete(stdout, "\n");
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEARECAAYFAk9/Yg4ACgkQvmGDOQUufZVpfQCcD3U6m1MbJOFZV4FgI7e042vF
+HcEAn0j6ZFwp9dh2G7PJSkN9CM0XazyJ
+=JUs1
+-----END PGP SIGNATURE-----