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

bug 15818, fixed one instance of ImageURLImpl being leaked for the icon on linux. r=pnunn

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@54859 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neeti%netscape.com
1999-12-01 04:02:57 +00:00
parent 32cafeec0d
commit 3518a79713
1 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
mozilla/gfx/src/nsImageNetContextSync.cpp
View File

@@ -219,52 +219,57 @@ ImageNetContextSyncImpl::GetURL(ilIURL* aURL,
rv = channel->OpenInputStream(0, -1, &stream);
NS_RELEASE(channel);
if (NS_FAILED(rv))
return -1;
if (NS_SUCCEEDED(rv)) {
if (aReader->StreamCreated(aURL, aContentType) == PR_TRUE) {
if (aReader->StreamCreated(aURL, aContentType) == PR_TRUE) {
// Read the URL data
char buf[2048];
PRUint32 count;
nsresult result;
PRBool first = PR_TRUE;
// Read the URL data
char buf[2048];
PRUint32 count;
nsresult result;
PRBool first = PR_TRUE;
result = stream->Read(buf, sizeof(buf), &count);
while (NS_SUCCEEDED(result) && (count > 0)) {
if (first == PR_TRUE) {
PRInt32 ilErr;
ilErr = aReader->FirstWrite((const unsigned char *)buf, (int32)count);
first = PR_FALSE;
// If FirstWrite fails then the image type cannot be determined
if (ilErr != 0) {
result = NS_ERROR_ABORT;
break;
}
}
aReader->Write((const unsigned char *)buf, (int32)count);
// Get the next block
result = stream->Read(buf, sizeof(buf), &count);
}
while (NS_SUCCEEDED(result) && (count > 0)) {
if (first == PR_TRUE) {
PRInt32 ilErr;
if (NS_FAILED(result)) {
ilErr = aReader->FirstWrite((const unsigned char *)buf, (int32)count);
first = PR_FALSE;
// If FirstWrite fails then the image type cannot be determined
if (ilErr != 0) {
result = NS_ERROR_ABORT;
break;
}
}
aReader->Write((const unsigned char *)buf, (int32)count);
// Get the next block
result = stream->Read(buf, sizeof(buf), &count);
}
if (NS_FAILED(result)) {
aReader->StreamAbort(-1);
status = -1;
} else {
NS_ASSERTION(0 == count, "expected EOF");
aReader->StreamComplete(PR_FALSE);
}
} else {
aReader->StreamAbort(-1);
status = -1;
} else {
NS_ASSERTION(0 == count, "expected EOF");
aReader->StreamComplete(PR_FALSE);
}
NS_IF_RELEASE(stream);
} else {
aReader->StreamAbort(-1);
status = -1;
}
NS_IF_RELEASE(stream);
nsCRT::free(aContentType);
} else {