[PATCH 3/3] notmuch-restore: use xtalloc version of strndup

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