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 D59D0431FD7 for ; Sun, 16 Dec 2012 19:24:29 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled 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 Kc4gnIyo-vFs for ; Sun, 16 Dec 2012 19:24:28 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 49DD5429E34 for ; Sun, 16 Dec 2012 19:24:26 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TkRJZ-0008Jm-Ew; Sun, 16 Dec 2012 23:24:25 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TkRJU-00063U-0F; Sun, 16 Dec 2012 23:24:20 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 3/3] notmuch-restore: use xtalloc version of strndup Date: Sun, 16 Dec 2012 23:24:07 -0400 Message-Id: <1355714648-23144-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355714648-23144-1-git-send-email-david@tethera.net> References: <1355714648-23144-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner 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: Mon, 17 Dec 2012 03:24:30 -0000 From: David Bremner This gives line numbers for better debugging. --- notmuch-restore.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/notmuch-restore.c b/notmuch-restore.c index 40596a8..0cc9c9f 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -85,9 +85,10 @@ parse_sup_line (void *ctx, char *line, return 1; } - *query_str = talloc_strndup (ctx, line + match[1].rm_so, - match[1].rm_eo - match[1].rm_so); - file_tags = talloc_strndup (ctx, line + match[2].rm_so, + *query_str = xtalloc_strndup (ctx, line + match[1].rm_so, + match[1].rm_eo - match[1].rm_so); + + file_tags = xtalloc_strndup (ctx, line + match[2].rm_so, match[2].rm_eo - match[2].rm_so); char *tok = file_tags; -- 1.7.10.4