ce/a1062d5de1e8f4624aa6ad7332f853f4d90b22

   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 28E82431FBD\r
   6         for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 13:06:45 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id qo5D0XjJ7w2Z for <notmuch@notmuchmail.org>;\r
  16         Fri, 24 Jan 2014 13:06:35 -0800 (PST)\r
  17 Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
  18  [74.125.83.53])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  5F85C431FB6    for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 13:06:35 -0800\r
  21  (PST)\r
  22 Received: by mail-ee0-f53.google.com with SMTP id t10so1200353eei.40\r
  23         for <notmuch@notmuchmail.org>; Fri, 24 Jan 2014 13:06:32 -0800 (PST)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:subject:in-reply-to:references\r
  27         :user-agent:date:message-id:mime-version:content-type;\r
  28         bh=27KuWtQW9iXq95Ap/jKvQ9n/FMUT+QwrRFO+cEekh7U=;\r
  29         b=aM4wI8SQFipICTC+UOE3yYpCMbqG6BGoILfpNDPbzJWsyBjf/daxwUkadN3uza7QCn\r
  30         IRoVotL7lj8o9x7EEqVmYmgNaF9TPeMBF5tOXr/7PcXgU05W13bnO0+gexISEQzmkf6M\r
  31         vBRaotyiNFzLW45nwvtWeN52qouG3zyC8RMxK22iHVGVHPg80x0/pze1VmGFrnndM18U\r
  32         CKyLwPgVStr2ji+MjXNu7ZoXKc44VyqYQq8dD91C7fFvlnm1s796AJkB0aT1jr8R7haF\r
  33         rwLdp9C9pHQB0ziTueFykuQZ9RAPWQBfbVPeEnBW7GkeybaozEWPlJWt26cDsrY11MLW\r
  34         vgQg==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQl6+kHBs7c6fV00yV14E6gPS4epRBPuS9RXdsLgJdJDENjStjeQl0JIJZlEBz0GXJaVAULi\r
  37 X-Received: by 10.14.100.71 with SMTP id y47mr4445636eef.91.1390597591326;\r
  38         Fri, 24 Jan 2014 13:06:31 -0800 (PST)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id 8sm7860282eeq.15.2014.01.24.13.06.29\r
  42         for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Fri, 24 Jan 2014 13:06:30 -0800 (PST)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
  47 Subject: Re: [PATCH 2/3] lib: make notmuch_threads_valid return FALSE when\r
  48         passed NULL\r
  49 In-Reply-To: <1390479841-17045-3-git-send-email-david@tethera.net>\r
  50 References: <m2r47zrkkc.fsf@guru.guru-group.fi>\r
  51         <1390479841-17045-1-git-send-email-david@tethera.net>\r
  52         <1390479841-17045-3-git-send-email-david@tethera.net>\r
  53 User-Agent: Notmuch/0.17+44~ge3b4cd9 (http://notmuchmail.org) Emacs/24.3.1\r
  54         (x86_64-pc-linux-gnu)\r
  55 Date: Fri, 24 Jan 2014 23:06:28 +0200\r
  56 Message-ID: <87wqhpf5t7.fsf@nikula.org>\r
  57 MIME-Version: 1.0\r
  58 Content-Type: text/plain\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Fri, 24 Jan 2014 21:06:45 -0000\r
  72 \r
  73 On Thu, 23 Jan 2014, David Bremner <david@tethera.net> wrote:\r
  74 > Without this patch, the example code in the header docs crashes for certain\r
  75 > invalid queries (see id:871u00oimv.fsf@approx.mit.edu)\r
  76 > ---\r
  77 >  lib/notmuch.h | 2 ++\r
  78 >  lib/query.cc  | 3 +++\r
  79 >  2 files changed, 5 insertions(+)\r
  80 >\r
  81 > diff --git a/lib/notmuch.h b/lib/notmuch.h\r
  82 > index 02604c5..68896ae 100644\r
  83 > --- a/lib/notmuch.h\r
  84 > +++ b/lib/notmuch.h\r
  85 > @@ -802,6 +802,8 @@ notmuch_query_destroy (notmuch_query_t *query);\r
  86 >   * valid object. Whereas when this function returns FALSE,\r
  87 >   * notmuch_threads_get will return NULL.\r
  88 >   *\r
  89 > + * If passed a NULL pointer, this function returns FALSE\r
  90 > + *\r
  91 >   * See the documentation of notmuch_query_search_threads for example\r
  92 >   * code showing how to iterate over a notmuch_threads_t object.\r
  93 >   */\r
  94 > diff --git a/lib/query.cc b/lib/query.cc\r
  95 > index ec60e2e..60ff8bd 100644\r
  96 > --- a/lib/query.cc\r
  97 > +++ b/lib/query.cc\r
  98 > @@ -462,6 +462,9 @@ notmuch_threads_valid (notmuch_threads_t *threads)\r
  99 >  {\r
 100 >      unsigned int doc_id;\r
 101 >  \r
 102 > +    if (! threads)\r
 103 > +     return FALSE;\r
 104 > +\r
 105 \r
 106 LGTM, and this is in line with notmuch_messages_valid().\r
 107 \r
 108 BR,\r
 109 Jani.\r
 110 \r
 111 >      while (threads->doc_id_pos < threads->doc_ids->len) {\r
 112 >       doc_id = g_array_index (threads->doc_ids, unsigned int,\r
 113 >                               threads->doc_id_pos);\r
 114 > -- \r
 115 > 1.8.5.2\r
 116 >\r
 117 > _______________________________________________\r
 118 > notmuch mailing list\r
 119 > notmuch@notmuchmail.org\r
 120 > http://notmuchmail.org/mailman/listinfo/notmuch\r