зеркало из https://github.com/mozilla/gecko-dev.git
Bug 663893 - Avoid null dereferences in websocket handler. r=mcmanus
--HG-- extra : transplant_source : %07%15%DD%3B%BF%B8%8B%BFK%1E3%28%7F%BE%8Ek%EFPu%7B
This commit is contained in:
Родитель
fdf159dafe
Коммит
a52bb595df
|
@ -865,9 +865,11 @@ nsWebSocketHandler::ProcessInput(PRUint8 *buffer, PRUint32 count)
|
|||
mCloseTimer->Cancel();
|
||||
mCloseTimer = nsnull;
|
||||
}
|
||||
nsCOMPtr<nsIRunnable> event =
|
||||
new CallOnServerClose(mListener, mContext);
|
||||
NS_DispatchToMainThread(event);
|
||||
if (mListener) {
|
||||
nsCOMPtr<nsIRunnable> event =
|
||||
new CallOnServerClose(mListener, mContext);
|
||||
NS_DispatchToMainThread(event);
|
||||
}
|
||||
|
||||
if (mClientClosed)
|
||||
ReleaseSession();
|
||||
|
@ -1314,9 +1316,11 @@ nsWebSocketHandler::StopSession(nsresult reason)
|
|||
|
||||
if (!mCalledOnStop) {
|
||||
mCalledOnStop = 1;
|
||||
nsCOMPtr<nsIRunnable> event =
|
||||
new CallOnStop(mListener, mContext, reason);
|
||||
NS_DispatchToMainThread(event);
|
||||
if (mListener) {
|
||||
nsCOMPtr<nsIRunnable> event =
|
||||
new CallOnStop(mListener, mContext, reason);
|
||||
NS_DispatchToMainThread(event);
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
Загрузка…
Ссылка в новой задаче