зеркало из https://github.com/mozilla/gecko-dev.git
Bug 504170 nsAStreamCopier::Process can use sourceCondition, sinkCondition uninitialized if someone cancels the copy early
r=dougt
This commit is contained in:
Родитель
f1e6b4e452
Коммит
3dbf2cbe0f
|
@ -388,12 +388,17 @@ public:
|
|||
|
||||
// notify state complete...
|
||||
if (mCallback) {
|
||||
nsresult status = sourceCondition;
|
||||
if (NS_SUCCEEDED(status))
|
||||
status = sinkCondition;
|
||||
if (status == NS_BASE_STREAM_CLOSED)
|
||||
status = NS_OK;
|
||||
mCallback(mClosure, canceled ? cancelStatus : status);
|
||||
nsresult status;
|
||||
if (!canceled) {
|
||||
status = sourceCondition;
|
||||
if (NS_SUCCEEDED(status))
|
||||
status = sinkCondition;
|
||||
if (status == NS_BASE_STREAM_CLOSED)
|
||||
status = NS_OK;
|
||||
} else {
|
||||
status = cancelStatus;
|
||||
}
|
||||
mCallback(mClosure, status);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче