commit b09f25e9a3ed33be8bff5e92d14e0fc7f638dc07
author Charles-François Natali <neologix@free.fr> Wed Aug 24 20:07:54 2011 +0200
committer Charles-François Natali <neologix@free.fr> Wed Aug 24 20:07:54 2011 +0200
tree c6cc36b4c8261bb339b884fdfca02c4a1e64a1ea
parent e049f470cd98a2304c7552939d3606344ab8302a

Issue12810: Remove check for negative unsigned value in socketmodule.c. Patch
by Joel Stanley.

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index e734608..e40e40b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -898,6 +898,7 @@
 RajGopal Srinivasan
 Quentin Stafford-Fraser
 Frank Stajano
+Joel Stanley
 Oliver Steele
 Greg Stein
 Chris Stern

Modules/socketmodule.c

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 5878ebb..9372fea 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1749,7 +1749,7 @@
     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;