Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash doing sspi auth, patch by schlichting@tu-harburg.de, r=cneberg@gmail.com, sr=bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@191871 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com
2006-03-07 02:38:31 +00:00
parent d3e7932d02
commit ea7e8fd39a
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/extensions/auth/nsAuthSSPI.cpp
View File

@@ -357,6 +357,10 @@ nsAuthSSPI::GetNextToken(const void *inToken,
&ctxAttr,
&ignored);
if (rc == SEC_I_CONTINUE_NEEDED || rc == SEC_E_OK) {
if (!ob.cbBuffer) {
nsMemory::Free(ob.pvBuffer);
ob.pvBuffer = NULL;
}
*outToken = ob.pvBuffer;
*outTokenLen = ob.cbBuffer;
@@ -501,21 +505,21 @@ nsAuthSSPI::Wrap(const void *inToken,
if (SEC_SUCCESS(rc)) {
int len = bufs.ib[0].cbBuffer + bufs.ib[1].cbBuffer + bufs.ib[2].cbBuffer;
char *p = (char *) nsMemory::Alloc(len);
*outToken = nsMemory::Alloc(len);
if (!*outToken)
if (!p)
return NS_ERROR_OUT_OF_MEMORY;
memcpy(outToken, bufs.ib[0].pvBuffer, bufs.ib[0].cbBuffer);
memcpy(outToken + bufs.ib[0].cbBuffer,
bufs.ib[1].pvBuffer, bufs.ib[1].cbBuffer);
memcpy(outToken + bufs.ib[0].cbBuffer + bufs.ib[1].cbBuffer,
bufs.ib[2].pvBuffer, bufs.ib[2].cbBuffer);
*outToken = (void *) p;
*outTokenLen = len;
memcpy(p, bufs.ib[0].pvBuffer, bufs.ib[0].cbBuffer);
p += bufs.ib[0].cbBuffer;
memcpy(p,bufs.ib[1].pvBuffer, bufs.ib[1].cbBuffer);
p += bufs.ib[1].cbBuffer;
memcpy(p,bufs.ib[2].pvBuffer, bufs.ib[2].cbBuffer);
return NS_OK;
}