public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: timerfd: Handle gettime error in settime
Date: Sun, 20 Jan 2019 23:15:00 -0000	[thread overview]
Message-ID: <20190120231509.110160.qmail@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a3268ac392241830cf6c91abe663f252c407cf8c

commit a3268ac392241830cf6c91abe663f252c407cf8c
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Mon Jan 21 00:14:51 2019 +0100

    Cygwin: timerfd: Handle gettime error in settime
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/timerfd.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/timerfd.cc b/winsup/cygwin/timerfd.cc
index 4f04efd..e5c17fb 100644
--- a/winsup/cygwin/timerfd.cc
+++ b/winsup/cygwin/timerfd.cc
@@ -590,8 +590,8 @@ timerfd_tracker::settime (int flags, const struct itimerspec *new_value,
 	  ret = -EBADF;
 	  __leave;
 	}
-      if (old_value)
-	gettime (old_value);
+      if (old_value && (ret = gettime (old_value)) < 0)
+	__leave;
       if (new_value->it_value.tv_sec == 0 && new_value->it_value.tv_nsec == 0)
 	ret = disarm_timer ();
       else


                 reply	other threads:[~2019-01-20 23:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

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

  git send-email \
    --in-reply-to=20190120231509.110160.qmail@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.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. 
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).