sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r8696: fixed ejs to more strictly follow the va_list rules. Might fix that

Browse Source 
pesky panic on x86_64
(This used to be commit 80177b29f4)
This commit is contained in:
Andrew Tridgell 2005-07-22 01:56:51 +00:00 committed by Gerald (Jerry) Carter
parent 6366a8dc2d
commit d55b75d833
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/lib/appweb/ejs/ejsParser.c
View File

@ -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);

2
source4/lib/appweb/mpr/miniMpr.c
View File

@ -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);
}