From a39dd9d38430149aff70b9bd03d29a6ade3582d5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 7 Apr 2010 15:36:25 +1700 Subject: [PATCH] [PATCH] fix obvious cut and paste error --- 69/a2546134fc5694395444cc1edd50c38924eaf0 | 77 +++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 69/a2546134fc5694395444cc1edd50c38924eaf0 diff --git a/69/a2546134fc5694395444cc1edd50c38924eaf0 b/69/a2546134fc5694395444cc1edd50c38924eaf0 new file mode 100644 index 000000000..02fad71e6 --- /dev/null +++ b/69/a2546134fc5694395444cc1edd50c38924eaf0 @@ -0,0 +1,77 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8E3F24196F4 + for ; Tue, 6 Apr 2010 15:36:27 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -4.2 +X-Spam-Level: +X-Spam-Status: No, score=-4.2 tagged_above=-999 required=5 + tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3] autolearn=ham +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id fmSYA5gqTKRk for ; + Tue, 6 Apr 2010 15:36:26 -0700 (PDT) +Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) + by olra.theworths.org (Postfix) with ESMTP id 2BE0B4196F0 + for ; Tue, 6 Apr 2010 15:36:26 -0700 (PDT) +Received: from localhost ([::1] helo=localhost.localdomain) + by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) + id 1NzHNh-00055S-Kd + for notmuch@notmuchmail.org; Tue, 06 Apr 2010 22:36:25 +0000 +Received: by localhost.localdomain (Postfix, from userid 500) + id 1ED1DC00DB; Tue, 6 Apr 2010 15:36:25 -0700 (PDT) +From: Dirk Hohndel +To: notmuch@notmuchmail.org +Subject: [PATCH] fix obvious cut and paste error +Date: Tue, 06 Apr 2010 15:36:25 -0700 +Message-ID: +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-SRS-Rewrite: SMTP reverse-path rewritten from by + bombadil.infradead.org See http://www.infradead.org/rpr.html +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 06 Apr 2010 22:36:27 -0000 + + +the wrong variable is checked for success of an allocation + +Signed-off-by: Dirk Hohndel +--- + lib/thread.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/thread.cc b/lib/thread.cc +index 1c8b39d..48c070e 100644 +--- a/lib/thread.cc ++++ b/lib/thread.cc +@@ -236,7 +236,7 @@ _notmuch_thread_create (void *ctx, + return NULL; + + matched_query = notmuch_query_create (notmuch, matched_query_string); +- if (unlikely (thread_id_query == NULL)) ++ if (unlikely (matched_query == NULL)) + return NULL; + + thread = talloc (ctx, notmuch_thread_t); +-- +1.6.6.1 + + + +-- +Dirk Hohndel +Intel Open Source Technology Center -- 2.26.2