debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-14 03:25:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sanitize "Subject:" and "Author:" fields to not contain control characters in notmuch-search

Browse source 
When a Subject field contained encoded CRLF sequences, these sequences
would appear unfiltered in the output of notmuch search. This confused
the notmuch emacs interface leading to "Unexpected Output"
messages. This is now fixed by replacing all characters with ASCII
code less than 32 with a question mark.

Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>
This commit is contained in:
Andreas Amann 2011-05-08 23:14:33 +02:00 • committed by Carl Worth
parent 09793b6132
commit f954b69251
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
notmuch-search.c
View file

@ -111,6 +111,20 @@ format_item_id_text (unused (const void *ctx),
printf ("%s%s", item_type, item_id);
}
static char *
sanitize_string (const void *ctx, const char *str)
{
char *out, *loop;
loop = out = talloc_strdup (ctx, str);
for (; *loop; loop++) {
if ((unsigned char)(*loop) < 32)
*loop = '?';
}
return out;
}
static void
format_thread_text (const void *ctx,
const char *thread_id,
@ -120,13 +134,17 @@ format_thread_text (const void *ctx,
const char *authors,
const char *subject)
{
void *ctx_quote = talloc_new (ctx);
printf ("thread:%s %12s [%d/%d] %s; %s",
thread_id,
notmuch_time_relative_date (ctx, date),
matched,
total,
authors,
subject);
sanitize_string (ctx_quote, authors),
sanitize_string (ctx_quote, subject));
talloc_free (ctx_quote);
}
static void