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

by Joel Stanley.

diff --git a/Misc/ACKS b/Misc/ACKS
index e7346082d789b1043ce0b190ed338c7641b035c1..e40e40b51dd417516f0502922186359f4a42b6ae 100644 (file)
--- 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 5878ebb0d3e8d40f2466e5df0ed5ecddd58b278b..9372feaa6eebe0a84666bf30fd13acdb93925561 100644 (file)
--- 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;