From b09f25e9a3ed33be8bff5e92d14e0fc7f638dc07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Charles-Fran=C3=A7ois=20Natali?= Date: Wed, 24 Aug 2011 20:07:54 +0200 Subject: [PATCH] Issue12810: Remove check for negative unsigned value in socketmodule.c. Patch by Joel Stanley. --- Misc/ACKS | 1 + Modules/socketmodule.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index e7346082d7..e40e40b51d 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -898,6 +898,7 @@ Nathan Srebro RajGopal Srinivasan Quentin Stafford-Fraser Frank Stajano +Joel Stanley Oliver Steele Greg Stein Chris Stern diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 5878ebb0d3..9372feaa6e 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1749,7 +1749,7 @@ cmsg_min_space(struct msghdr *msg, struct cmsghdr *cmsgh, size_t space) static const size_t cmsg_len_end = (offsetof(struct cmsghdr, cmsg_len) + sizeof(cmsgh->cmsg_len)); - if (cmsgh == NULL || msg->msg_control == NULL || msg->msg_controllen < 0) + if (cmsgh == NULL || msg->msg_control == NULL) return 0; if (space < cmsg_len_end) space = cmsg_len_end; -- 2.49.0