summaryrefslogtreecommitdiff
path: root/source4/lib/appweb/mpr/miniMpr.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-19 04:00:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:11 -0500
commitf8219ec5a8502975f347323900ff3245ff5222dc (patch)
treeb80a2683164ccf4c7da7188c010abc340fd5f639 /source4/lib/appweb/mpr/miniMpr.c
parent3c097f3afb51f41abe2be6a5698dabba559b75fc (diff)
downloadsamba-f8219ec5a8502975f347323900ff3245ff5222dc.tar.gz
samba-f8219ec5a8502975f347323900ff3245ff5222dc.tar.bz2
samba-f8219ec5a8502975f347323900ff3245ff5222dc.zip
r23961: Allow SWAT to operate on x86_64 machines.
On machines with a 4 byte int, and a 8 byte pointer, the ESP could would fail. The problem is that 0 != NULL. 0 is an int (4 bytes) and NULL is a pointer (8), and this matters critically to varargs functions. If a 0 was passed as the 'terminating' argument, then only 4 bytes would be written to the stack, but va_arg(ap, char *) would try and pull 8, reading uninitalised memory. Andrew Bartlett (This used to be commit 72ca8e3b2a45179b731790e6329b978b22ac1ec0)
Diffstat (limited to 'source4/lib/appweb/mpr/miniMpr.c')
-rw-r--r--source4/lib/appweb/mpr/miniMpr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.c b/source4/lib/appweb/mpr/miniMpr.c
index 8df1817bf1..949d64fcf1 100644
--- a/source4/lib/appweb/mpr/miniMpr.c
+++ b/source4/lib/appweb/mpr/miniMpr.c
@@ -387,7 +387,10 @@ static int mprCoreStrcat(int alloc, char **destp, int destMax, int existingLen,
return required - 1;
}
-/*****************************************************************************/
+/*****************************************************************************
+ Note that this VARARGS function must be NULL (not 0, this must be a
+ pointer) terminated
+*/
int mprReallocStrcat(char **destp, int destMax, int existingLen,
const char *delim, const char *src,...)