Declare a buffer of the right size for PR_AcceptRead.

Modified files: accept.c, acceptread.c, ntioto.c, server_test.c,
servr_kk.c, servr_ku.c, servr_uk.c, servr_uu.c
(NSPRPUB_RELEASE_4_0_BRANCH)

8 files changed, 16 insertions, 14 deletions

diff --git a/pr/tests/accept.c b/pr/tests/accept.c
index e2fb0a05..1b64b5bd 100644
--- a/pr/tests/accept.c
+++ b/pr/tests/accept.c
@@ -84,7 +84,7 @@ static PRNetAddr listenAddr;
 static PRNetAddr clientAddr;
 static PRThread *clientThread;
 static PRNetAddr *raddr;
-static char buf[4096 + 64];
+static char buf[4096 + 2*sizeof(PRNetAddr) + 32];
 static PRInt32 status;
 static PRInt32 bytesRead;
 
diff --git a/pr/tests/acceptread.c b/pr/tests/acceptread.c
index d24e93c1..a6b257db 100644
--- a/pr/tests/acceptread.c
+++ b/pr/tests/acceptread.c
@@ -105,7 +105,7 @@ static void AcceptingThread(void *arg)
     PRStatus rv;
     PRInt32 bytes;
     PRSize buf_size = BUF_SIZE;
-    PRUint8 buf[BUF_SIZE + (20 * sizeof(PRNetAddr))];
+    PRUint8 buf[BUF_SIZE + (2 * sizeof(PRNetAddr)) + 32];
     PRNetAddr *accept_addr, *listen_addr = (PRNetAddr*)arg;
     PRFileDesc *accept_sock, *listen_sock = PR_NewTCPSocket();
     PRSocketOptionData sock_opt;
diff --git a/pr/tests/ntioto.c b/pr/tests/ntioto.c
index e5c9ecea..232348a7 100644
--- a/pr/tests/ntioto.c
+++ b/pr/tests/ntioto.c
@@ -56,6 +56,7 @@
 #include <nspr.h> 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /*
 ** Test harness infrastructure
@@ -98,7 +99,8 @@ static void Help( void )
 static void AcceptThread(void *arg)
 {
     PRIntn bytesRead;
-    char dataBuf[100];
+#define DATA_LEN 10
+    char dataBuf[DATA_LEN + 2*sizeof(PRNetAddr) + 32];
     PRFileDesc  *arSock;
     PRNetAddr   *arAddr;
 
@@ -106,7 +108,7 @@ static void AcceptThread(void *arg)
         &arSock,
         &arAddr,
         dataBuf,
-        10,
+        DATA_LEN,
         PR_SecondsToInterval(1));
 
     if ( bytesRead == -1 && PR_GetError() == PR_IO_TIMEOUT_ERROR )
diff --git a/pr/tests/server_test.c b/pr/tests/server_test.c
index 10e70bac..6553f439 100644
--- a/pr/tests/server_test.c
+++ b/pr/tests/server_test.c
@@ -160,8 +160,8 @@ WorkerThreadFunc(void *_listenSock)
     char *sendBuf;
 
     if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(4*sizeof(PRNetAddr)), _client_data, (4*sizeof(PRNetAddr)));
-    dataBuf = (char *)PR_MALLOC(_client_data *sizeof(char) + 4*sizeof(PRNetAddr));
+            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
+    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
     if (!dataBuf)
         if (debug_mode) printf("\tServer could not malloc space!?\n");
     sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
diff --git a/pr/tests/servr_kk.c b/pr/tests/servr_kk.c
index 3a225ff1..7ad32922 100644
--- a/pr/tests/servr_kk.c
+++ b/pr/tests/servr_kk.c
@@ -126,8 +126,8 @@ WorkerThreadFunc(void *_listenSock)
     char *sendBuf;
 
     if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(4*sizeof(PRNetAddr)), _client_data, (4*sizeof(PRNetAddr)));
-    dataBuf = (char *)PR_MALLOC(_client_data *sizeof(char) + 4*sizeof(PRNetAddr));
+            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
+    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
     if (!dataBuf)
         if (debug_mode) printf("\tServer could not malloc space!?\n");
     sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
diff --git a/pr/tests/servr_ku.c b/pr/tests/servr_ku.c
index 53a117fa..1c573ffe 100644
--- a/pr/tests/servr_ku.c
+++ b/pr/tests/servr_ku.c
@@ -127,8 +127,8 @@ WorkerThreadFunc(void *_listenSock)
     char *sendBuf;
 
     if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(4*sizeof(PRNetAddr)), _client_data, (4*sizeof(PRNetAddr)));
-    dataBuf = (char *)PR_MALLOC(_client_data *sizeof(char) + 4*sizeof(PRNetAddr));
+            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
+    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
     if (!dataBuf)
         if (debug_mode) printf("\tServer could not malloc space!?\n");
     sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
diff --git a/pr/tests/servr_uk.c b/pr/tests/servr_uk.c
index ef20cf08..19206b57 100644
--- a/pr/tests/servr_uk.c
+++ b/pr/tests/servr_uk.c
@@ -129,8 +129,8 @@ WorkerThreadFunc(void *_listenSock)
     char *sendBuf;
 
     if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(4*sizeof(PRNetAddr)), _client_data, (4*sizeof(PRNetAddr)));
-    dataBuf = (char *)PR_MALLOC(_client_data *sizeof(char) + 4*sizeof(PRNetAddr));
+            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
+    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
     if (!dataBuf)
         if (debug_mode) printf("\tServer could not malloc space!?\n");
     sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));
diff --git a/pr/tests/servr_uu.c b/pr/tests/servr_uu.c
index b6fc3a8f..8b9bc47d 100644
--- a/pr/tests/servr_uu.c
+++ b/pr/tests/servr_uu.c
@@ -127,8 +127,8 @@ WorkerThreadFunc(void *_listenSock)
     char *sendBuf;
 
     if (debug_mode) DPRINTF("\tServer buffer is %d bytes; %d data, %d netaddrs\n",
-            _client_data+(4*sizeof(PRNetAddr)), _client_data, (4*sizeof(PRNetAddr)));
-    dataBuf = (char *)PR_MALLOC(_client_data *sizeof(char) + 4*sizeof(PRNetAddr));
+            _client_data+(2*sizeof(PRNetAddr))+32, _client_data, (2*sizeof(PRNetAddr))+32);
+    dataBuf = (char *)PR_MALLOC(_client_data + 2*sizeof(PRNetAddr) + 32);
     if (!dataBuf)
         if (debug_mode) printf("\tServer could not malloc space!?\n");
     sendBuf = (char *)PR_MALLOC(_server_data *sizeof(char));