Attachment 863242 Details for Bug 1058972 – proposed patch

[patch] proposed patch

0001-Check-if-we-are-on-tty-before-initializing-curses.patch (text/plain), 1.15 KB, created by Stanislav Ochotnicky on 2014-02-14 12:03:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Ochotnicky

Created: 2014-02-14 12:03:43 UTC

Size: 1.15 KB

patch

obsolete

>From e19a5884e5a1fb4156c69369e30143a1f3b25827 Mon Sep 17 00:00:00 2001
>From: Stanislav Ochotnicky <sochotnicky@redhat.com>
>Date: Fri, 14 Feb 2014 11:59:22 +0100
>Subject: [PATCH] Check if we are on tty before initializing curses
>
>    When we did not have a ttyname we just used stdin/out without checking if
>    it's a proper TTY or a pipe. In some cases this can cause endless loop or
>    escape seqeunces on the terminal.
>
>    This commit changes behaviour so that if stdin/out is not tty and no ttyname
>    is specified we error-out with errno set to ENOTTY
>
>    * pinentry/pinentry-curses.c
>---
> pinentry/pinentry-curses.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
>index 58da255..4fc8bc4 100644
>--- a/pinentry/pinentry-curses.c
>+++ b/pinentry/pinentry-curses.c
>@@ -752,6 +752,11 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
>     {
>       if (!init_screen)
> 	{
>+          if (!(isatty(fileno(stdin)) && isatty(fileno(stdout))))
>+            {
>+              errno = ENOTTY;
>+              return -1;
>+            }
> 	  init_screen = 1;
> 	  initscr ();
> 	}
>-- 
>1.8.3.2
>

Actions: View | Diff

Attachments on bug 1058972: 863242