From: Julian Seward <jseward@acm.org>
Date: Wed, 14 May 2008 12:57:56 +0000 (+0000)
Subject: Merge r8049 (#158425: sys_poll incorrectly emulated when RES==0)
X-Git-Tag: svn/VALGRIND_3_3_1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96895a523c22482a89105c234bf5bc0605c19912;p=thirdparty%2Fvalgrind.git

Merge r8049 (#158425: sys_poll incorrectly emulated when RES==0)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8086
---

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index ccea5c5fb0..4879869874 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -5258,7 +5258,7 @@ PRE(sys_poll)
 
 POST(sys_poll)
 {
-   if (RES > 0) {
+   if (RES >= 0) {
       UInt i;
       struct vki_pollfd* ufds = (struct vki_pollfd *)ARG1;
       for (i = 0; i < ARG2; i++)