e4/d0287c8392c81efdae80aed3cd282e8c21a256

   1 Return-Path: <jani@nikula.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id AD42742116A\r
   6         for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:46 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id vhKQHZBVHNAT for <notmuch@notmuchmail.org>;\r
  17         Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
  18 Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com\r
  19         [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 8793E421169\r
  22         for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
  23 Received: by mail-bk0-f53.google.com with SMTP id j4so1547751bkw.26\r
  24         for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=google.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
  28         :in-reply-to:references:x-gm-message-state;\r
  29         bh=TsWGZWrnVGOmi6Hm2//eppuh7J+3J7ubp5qYb9lfNsE=;\r
  30         b=ndYveopER/q3TvEJKyyoFttUMQ0XiGa5zxnc6Br+OfXhOiZwcm4pd3Pa8EPZ2pKNot\r
  31         Ro37GboFsKXSZ1ik56OrA+Gm7ELG+wZaavl1EDO7XtLXh/yyboUJogm7LYiLz5USO3Do\r
  32         yeuQkGGBvn007iH6adkB9Hkg9EjxqWm3g28jkVbxkCLi4yZETvW2sBgB8d3ElPRxgpSc\r
  33         6SUgbb9EmX9sK2DlD5S1Vqv5SyiMZ/4ZdujJNzW9Riv6RXbCBsdMy466HCXp/Ky9osQx\r
  34         QbiPuIdTBT2HhyAL+hImkCPwMotLtjb9T3iJHe90P20B83IWfCx0qTceH1RX+WPNMW3H\r
  35         3Jkg==\r
  36 Received: by 10.204.136.220 with SMTP id s28mr1372652bkt.94.1333232264112;\r
  37         Sat, 31 Mar 2012 15:17:44 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.\r
  39         [84.248.80.253])\r
  40         by mx.google.com with ESMTPS id t17sm28577387bke.6.2012.03.31.15.17.42\r
  41         (version=SSLv3 cipher=OTHER); Sat, 31 Mar 2012 15:17:43 -0700 (PDT)\r
  42 From: Jani Nikula <jani@nikula.org>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 2/8] hex-escape: be more strict about the format while\r
  45  decoding\r
  46 Date: Sun,  1 Apr 2012 01:17:22 +0300\r
  47 Message-Id:\r
  48  <81e543344ffe8e2761afd57a2268e8b362f4aef4.1333231401.git.jani@nikula.org>\r
  49 X-Mailer: git-send-email 1.7.5.4\r
  50 In-Reply-To: <cover.1333231401.git.jani@nikula.org>\r
  51 References: <cover.1333231401.git.jani@nikula.org>\r
  52 In-Reply-To: <cover.1333231401.git.jani@nikula.org>\r
  53 References: <cover.1333231401.git.jani@nikula.org>\r
  54 X-Gm-Message-State:\r
  55  ALoCoQmfxuZvT1x2Htd1paR0/3dHTZdkBmQ7wApmqQA5m6l2kupym56MEVv1Zbl73oij2Xf5Qdrh\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sat, 31 Mar 2012 22:17:46 -0000\r
  69 \r
  70 Signed-off-by: Jani Nikula <jani@nikula.org>\r
  71 \r
  72 ---\r
  73 \r
  74 This could be folded to "hex-escape: (en|de)code strings to/from\r
  75 restricted character set".\r
  76 ---\r
  77  util/hex-escape.c |    7 ++++---\r
  78  1 files changed, 4 insertions(+), 3 deletions(-)\r
  79 \r
  80 diff --git a/util/hex-escape.c b/util/hex-escape.c\r
  81 index 6c1260b..9de79df 100644\r
  82 --- a/util/hex-escape.c\r
  83 +++ b/util/hex-escape.c\r
  84 @@ -21,6 +21,7 @@\r
  85  #include <assert.h>\r
  86  #include <string.h>\r
  87  #include <talloc.h>\r
  88 +#include <ctype.h>\r
  89  #include "error_util.h"\r
  90  #include "hex-escape.h"\r
  91  \r
  92 @@ -131,18 +132,18 @@ hex_decode (void *ctx, const char *in, char **out, size_t * out_size)\r
  93  \r
  94             char *endp;\r
  95  \r
  96 -           if (len < 3)\r
  97 +           if (!isxdigit ((unsigned char) p[1]) ||\r
  98 +               !isxdigit ((unsigned char) p[2]))\r
  99                 return HEX_SYNTAX_ERROR;\r
 100  \r
 101             buf[0] = p[1];\r
 102             buf[1] = p[2];\r
 103  \r
 104 -           *q = strtol (buf, &endp, 16);\r
 105 +           *q = strtoul (buf, &endp, 16);\r
 106  \r
 107             if (endp != buf + 2)\r
 108                 return HEX_SYNTAX_ERROR;\r
 109  \r
 110 -           len -= 3;\r
 111             p += 3;\r
 112             q++;\r
 113         } else {\r
 114 -- \r
 115 1.7.5.4\r
 116 \r