Fix apparently trivial buffer overflow (SF bug 1060396).

memset() wrote one past the end of the buffer, which was likely to be unused padding or a yet-to-be-initialized local variable.  This routine is already tested by test_socket.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e239caf013a9b66e994cb1cb314756a69ec27b62..3c17e9ce48b38694e4c21177babf90c91925f7b6 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3351,7 +3351,7 @@ socket_inet_ntop(PyObject *self, PyObject *args)
 #endif
        
        /* Guarantee NUL-termination for PyString_FromString() below */
-       memset((void *) &ip[0], '\0', sizeof(ip) + 1);
+       memset((void *) &ip[0], '\0', sizeof(ip));
 
        if (!PyArg_ParseTuple(args, "is#:inet_ntop", &af, &packed, &len)) {
                return NULL;