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 | |
| 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')
| -rw-r--r-- | source4/lib/appweb/ejs/ejsParser.c | 6 | ||||
| -rw-r--r-- | source4/lib/appweb/mpr/miniMpr.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source4/lib/appweb/ejs/ejsParser.c b/source4/lib/appweb/ejs/ejsParser.c index dadd3eac11..5b8b84f7b3 100644 --- a/source4/lib/appweb/ejs/ejsParser.c +++ b/source4/lib/appweb/ejs/ejsParser.c @@ -230,7 +230,7 @@ static int parseStmt(Ejs *ep, int state, int flags) #if BLD_DEBUG fullNameLen = mprReallocStrcat(&fullName, MPR_MAX_VAR, fullNameLen, - 0, ".", 0); + 0, ".", NULL); #endif ep->currentProperty = vp; @@ -266,7 +266,7 @@ static int parseStmt(Ejs *ep, int state, int flags) * If not executing yet, id may not be known */ fullNameLen = mprReallocStrcat(&fullName, MPR_MAX_VAR, - fullNameLen, 0, "[", id, "]", 0); + fullNameLen, 0, "[", id, "]", NULL); } #endif @@ -1258,7 +1258,7 @@ static int parseId(Ejs *ep, int state, int flags, char **id, char **fullName, *id = mprStrdup(ep->token); #if BLD_DEBUG *fullNameLen = mprReallocStrcat(fullName, MPR_MAX_VAR, *fullNameLen, - 0, *id, 0); + 0, *id, NULL); #endif if (ep->currentObj == 0) { ep->currentObj = ejsFindObj(ep, state, *id, flags); 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); } |