unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: david@tethera.net
To: notmuch@notmuchmail.org
Cc: David Bremner <bremner@debian.org>
Subject: [PATCH 3/3] notmuch-restore: use xtalloc version of strndup
Date: Sun, 16 Dec 2012 23:24:07 -0400	[thread overview]
Message-ID: <1355714648-23144-4-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1355714648-23144-1-git-send-email-david@tethera.net>

From: David Bremner <bremner@debian.org>

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

      parent reply	other threads:[~2012-12-17  3:24 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-17  3:24 talloc leak debugging david
2012-12-17  3:24 ` [PATCH 1/3] CLI: add talloc leak report, controlled by an environment variable david
2012-12-20 15:40   ` Tomi Ollila
2012-12-20 16:58     ` David Bremner
2012-12-21  1:55   ` Austin Clements
2012-12-17  3:24 ` [PATCH 2/3] util: add xtalloc.[ch] david
2012-12-20 15:42   ` Tomi Ollila
2012-12-21  2:03   ` Austin Clements
2012-12-17  3:24 ` david [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355714648-23144-4-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=bremner@debian.org \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).