aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFraser Adams <fraser.adams@blueyonder.co.uk>2013-11-18 19:28:21 +0000
committerFraser Adams <fraser.adams@blueyonder.co.uk>2013-11-18 19:28:21 +0000
commit5e49fbbfdcca308b7f9d747fc66d3c92c03ac241 (patch)
tree2c92453871495a66c9a387793eeb3a749a2335b8 /src
parent047280d98decd0c4071b0a044461569b84193023 (diff)
fix a bug in the accept call in library.js whereby if accept was called with non-NULL addr and addrlen parameters a ReferenceError occurs because accept had a parameter of addrp but later used addr. Modified tests_sockets_echo_server.c to use non-NULL addr if TEST_ACCEPT_ADDR is defined and added test case to test_sockets.py
Diffstat (limited to 'src')
-rw-r--r--src/library.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library.js b/src/library.js
index 16089bc4..a5380c3a 100644
--- a/src/library.js
+++ b/src/library.js
@@ -8237,7 +8237,7 @@ LibraryManager.library = {
},
accept__deps: ['$FS', '$SOCKFS', '$DNS', '$ERRNO_CODES', '__setErrNo', '_write_sockaddr'],
- accept: function(fd, addrp, addrlen) {
+ accept: function(fd, addr, addrlen) {
var sock = SOCKFS.getSocket(fd);
if (!sock) {
___setErrNo(ERRNO_CODES.EBADF);
@@ -8245,7 +8245,7 @@ LibraryManager.library = {
}
try {
var newsock = sock.sock_ops.accept(sock);
- if (addrp) {
+ if (addr) {
var res = __write_sockaddr(addr, newsock.family, DNS.lookup_name(newsock.daddr), newsock.dport);
assert(!res.errno);
}