gpgparsemail: Fix last commit (3f2bdac)
authorWerner Koch <wk@gnupg.org>
Fri, 10 Apr 2015 06:34:35 +0000 (08:34 +0200)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 15 Apr 2015 07:08:32 +0000 (16:08 +0900)
* tools/rfc822parse.c (parse_field): Replace break by goto.
--

Brown paper bag bug: Changing an IF to a WHILE inside another loop
requires to fix the inner break.

Reported-by: Hanno Böck
Signed-off-by: Werner Koch <wk@gnupg.org>
(backported from 2.1 commit 9433661419043431a6cfc7d84c8450e0b2f6c353)

tools/rfc822parse.c

index 7b86ea9..7895e0b 100644 (file)
@@ -829,7 +829,7 @@ parse_field (HDR_LINE hdr)
              while (!*s)
                {
                  if (!hdr->next || !hdr->next->cont)
-                   break;
+                   goto oparen_out;
                   /* Next item is a header continuation line.  */
                  hdr = hdr->next;
                  s = hdr->line;
@@ -852,6 +852,7 @@ parse_field (HDR_LINE hdr)
              else if (*s == '\"')
                in_quote = 1;
            }
+        oparen_out:
          if (!*s)
            ; /* Actually this is an error, but we don't care about it. */
          else