summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2013-08-23 20:40:27 +0000
committerCorinna Vinschen <corinna@vinschen.de>2013-08-23 20:40:27 +0000
commit8451a289ccfb394922470880952aaa6a372122a1 (patch)
tree57c186e8ebf8e0ef622e1d271924c4f71a7f1de9
parent94f900f805c2a2049e2e857457ec24d269ec08b0 (diff)
downloadcygnal-8451a289ccfb394922470880952aaa6a372122a1.tar.gz
cygnal-8451a289ccfb394922470880952aaa6a372122a1.tar.bz2
cygnal-8451a289ccfb394922470880952aaa6a372122a1.zip
* flock.cc (lockf_t::from_obj_name): Fix test for valid pid.
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/flock.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index dfc72baf6..8dda31cca 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-23 Corinna Vinschen <corinna@vinschen.de>
+
+ * flock.cc (lockf_t::from_obj_name): Fix test for valid pid.
+
2013-08-23 Christopher Faylor <me.cygwin2013@cgf.cx>
* spawn.cc (child_info_spawn): Revert previous change. Always set
diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc
index c9d7eb6ea..33f16af06 100644
--- a/winsup/cygwin/flock.cc
+++ b/winsup/cygwin/flock.cc
@@ -564,7 +564,7 @@ lockf_t::from_obj_name (inode_t *node, lockf_t **head, const wchar_t *name)
return false;
lf_id = wcstoll (endptr + 1, &endptr, 16);
if (!endptr || *endptr != L'-'
- || ((lf_flags & F_POSIX) && (lf_id < 1 || lf_id > ULONG_MAX)))
+ || ((lf_flags & F_POSIX) && (lf_id < 1 || lf_id > UINT32_MAX)))
return false;
lf_wid = wcstoul (endptr + 1, &endptr, 16);
if (!endptr || *endptr != L'-')