Attachment #381668 for bug #500518

View | Details | Raw Unified | Return to bug 500518
Collapse All | Expand All





    _testRecvFromIntoMemoryview = _testRecvFromIntoArray

    def testRecvFromIntoSmallBuffer(self):
        # See issue #20246.
        buf = bytearray(8)
        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)

    def _testRecvFromIntoSmallBuffer(self):
        with test_support.check_py3k_warnings():
            buf = buffer(MSG)
        self.serv_conn.send(buf)


TIPC_STYPE = 2000
TIPC_LOWER = 200

Lines 973-978 Link Here

(-)Python-2.7.6.orig/Misc/ACKS (+1 lines)
973	Christopher Smith	973	Christopher Smith
974	Gregory P. Smith	974	Gregory P. Smith
975	Roy Smith	975	Roy Smith
		976	Ryan Smith-Roberts
976	Rafal Smotrzyk	977	Rafal Smotrzyk
977	Dirk Soede	978	Dirk Soede
978	Paul Sokolovsky	979	Paul Sokolovsky

Lines 2742-2747 Link Here

(-)Python-2.7.6.orig/Modules/socketmodule.c (+4 lines)
2742	if (recvlen == 0) {	2742	if (recvlen == 0) {
2743	/* If nbytes was not specified, use the buffer's length */	2743	/* If nbytes was not specified, use the buffer's length */
2744	recvlen = buflen;	2744	recvlen = buflen;
		2745	} else if (recvlen > buflen) {
		2746	PyErr_SetString(PyExc_ValueError,
		2747	"nbytes is greater than the length of the buffer");
		2748	goto error;
2745	}	2749	}
2746		2750
2747	readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);	2751	readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);

Return to bug 500518

Lines 1616-1621 Link Here

(-)Python-2.7.6.orig/Lib/test/test_socket.py (+10 lines)
1616		1616
1617	_testRecvFromIntoMemoryview = _testRecvFromIntoArray	1617	_testRecvFromIntoMemoryview = _testRecvFromIntoArray
1618		1618
		1619	def testRecvFromIntoSmallBuffer(self):
		1620	# See issue #20246.
		1621	buf = bytearray(8)
		1622	self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
		1623
		1624	def _testRecvFromIntoSmallBuffer(self):
		1625	with test_support.check_py3k_warnings():
		1626	buf = buffer(MSG)
		1627	self.serv_conn.send(buf)
		1628
1619		1629
1620	TIPC_STYPE = 2000	1630	TIPC_STYPE = 2000
1621	TIPC_LOWER = 200	1631	TIPC_LOWER = 200