diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-07-22 01:56:51 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:55 -0500 |
commit | d55b75d8336326a2f8aaad2144e53d8b821a3b21 (patch) | |
tree | 57e47f3685800fb55a12b11e34875718f6ad04c6 /source4/lib/appweb/mpr | |
parent | 6366a8dc2df6e72f162bb44d93b4d329ba8008a7 (diff) | |
download | samba-d55b75d8336326a2f8aaad2144e53d8b821a3b21.tar.gz samba-d55b75d8336326a2f8aaad2144e53d8b821a3b21.tar.bz2 samba-d55b75d8336326a2f8aaad2144e53d8b821a3b21.zip |
r8696: fixed ejs to more strictly follow the va_list rules. Might fix that
pesky panic on x86_64
(This used to be commit 80177b29f4b32996d41a87df041c4c1bfb6876c2)
Diffstat (limited to 'source4/lib/appweb/mpr')
-rw-r--r-- | source4/lib/appweb/mpr/miniMpr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/lib/appweb/mpr/miniMpr.c b/source4/lib/appweb/mpr/miniMpr.c index 615b46bf09..f4c219fe4c 100644 --- a/source4/lib/appweb/mpr/miniMpr.c +++ b/source4/lib/appweb/mpr/miniMpr.c @@ -343,6 +343,7 @@ static int mprCoreStrcat(int alloc, char **destp, int destMax, int existingLen, addBytes += strlen(str) + sepLen; str = va_arg(ap, const char*); } + va_end(ap); if (existingLen > 0) { addBytes += sepLen; @@ -387,6 +388,7 @@ static int mprCoreStrcat(int alloc, char **destp, int destMax, int existingLen, dp += sepLen; } } + va_end(ap); } else if (dest == 0) { dest = (char*) mprMalloc(1); } |