[PATCH 2/8] hex-escape: be more strict about the format while decoding

diff --git a/e4/d0287c8392c81efdae80aed3cd282e8c21a256 b/e4/d0287c8392c81efdae80aed3cd282e8c21a256
new file mode 100644 (file)
index 0000000..45d22a4
--- /dev/null
+++ b/e4/d0287c8392c81efdae80aed3cd282e8c21a256
@@ -0,0 +1,116 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AD42742116A\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id vhKQHZBVHNAT for <notmuch@notmuchmail.org>;\r
+       Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
+Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8793E421169\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
+Received: by mail-bk0-f53.google.com with SMTP id j4so1547751bkw.26\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=TsWGZWrnVGOmi6Hm2//eppuh7J+3J7ubp5qYb9lfNsE=;\r
+       b=ndYveopER/q3TvEJKyyoFttUMQ0XiGa5zxnc6Br+OfXhOiZwcm4pd3Pa8EPZ2pKNot\r
+       Ro37GboFsKXSZ1ik56OrA+Gm7ELG+wZaavl1EDO7XtLXh/yyboUJogm7LYiLz5USO3Do\r
+       yeuQkGGBvn007iH6adkB9Hkg9EjxqWm3g28jkVbxkCLi4yZETvW2sBgB8d3ElPRxgpSc\r
+       6SUgbb9EmX9sK2DlD5S1Vqv5SyiMZ/4ZdujJNzW9Riv6RXbCBsdMy466HCXp/Ky9osQx\r
+       QbiPuIdTBT2HhyAL+hImkCPwMotLtjb9T3iJHe90P20B83IWfCx0qTceH1RX+WPNMW3H\r
+       3Jkg==\r
+Received: by 10.204.136.220 with SMTP id s28mr1372652bkt.94.1333232264112;\r
+       Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.\r
+       [84.248.80.253])\r
+       by mx.google.com with ESMTPS id t17sm28577387bke.6.2012.03.31.15.17.42\r
+       (version=SSLv3 cipher=OTHER); Sat, 31 Mar 2012 15:17:43 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/8] hex-escape: be more strict about the format while\r
+ decoding\r
+Date: Sun,  1 Apr 2012 01:17:22 +0300\r
+Message-Id:\r
+ <81e543344ffe8e2761afd57a2268e8b362f4aef4.1333231401.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1333231401.git.jani@nikula.org>\r
+References: <cover.1333231401.git.jani@nikula.org>\r
+In-Reply-To: <cover.1333231401.git.jani@nikula.org>\r
+References: <cover.1333231401.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmfxuZvT1x2Htd1paR0/3dHTZdkBmQ7wApmqQA5m6l2kupym56MEVv1Zbl73oij2Xf5Qdrh\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 31 Mar 2012 22:17:46 -0000\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+\r
+---\r
+\r
+This could be folded to "hex-escape: (en|de)code strings to/from\r
+restricted character set".\r
+---\r
+ util/hex-escape.c |    7 ++++---\r
+ 1 files changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/util/hex-escape.c b/util/hex-escape.c\r
+index 6c1260b..9de79df 100644\r
+--- a/util/hex-escape.c\r
++++ b/util/hex-escape.c\r
+@@ -21,6 +21,7 @@\r
+ #include <assert.h>\r
+ #include <string.h>\r
+ #include <talloc.h>\r
++#include <ctype.h>\r
+ #include "error_util.h"\r
+ #include "hex-escape.h"\r
+ \r
+@@ -131,18 +132,18 @@ hex_decode (void *ctx, const char *in, char **out, size_t * out_size)\r
+ \r
+           char *endp;\r
+ \r
+-          if (len < 3)\r
++          if (!isxdigit ((unsigned char) p[1]) ||\r
++              !isxdigit ((unsigned char) p[2]))\r
+               return HEX_SYNTAX_ERROR;\r
+ \r
+           buf[0] = p[1];\r
+           buf[1] = p[2];\r
+ \r
+-          *q = strtol (buf, &endp, 16);\r
++          *q = strtoul (buf, &endp, 16);\r
+ \r
+           if (endp != buf + 2)\r
+               return HEX_SYNTAX_ERROR;\r
+ \r
+-          len -= 3;\r
+           p += 3;\r
+           q++;\r
+       } else {\r
+-- \r
+1.7.5.4\r
+\r