зеркало из https://github.com/mozilla/pjs.git
Fix 63170: crash in [add|remove]Observer if either argument is null. r=dveditz sr=alecf
This commit is contained in:
Родитель
a7bc2af406
Коммит
ea488282ff
|
@ -1217,6 +1217,9 @@ NS_IMETHODIMP nsPref::UnregisterCallback( const char* domain,
|
|||
NS_IMETHODIMP nsPref::AddObserver(const char *domain,
|
||||
nsIObserver *observer)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(domain);
|
||||
NS_ENSURE_ARG_POINTER(observer);
|
||||
|
||||
nsCStringKey key(domain);
|
||||
mObservers.Put(&key, observer);
|
||||
return RegisterCallback(domain, NotifyObserver, observer);
|
||||
|
@ -1225,6 +1228,9 @@ NS_IMETHODIMP nsPref::AddObserver(const char *domain,
|
|||
NS_IMETHODIMP nsPref::RemoveObserver(const char *domain,
|
||||
nsIObserver *observer)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(domain);
|
||||
NS_ENSURE_ARG_POINTER(observer);
|
||||
|
||||
nsCStringKey key(domain);
|
||||
mObservers.Remove(&key);
|
||||
return UnregisterCallback(domain, NotifyObserver, observer);
|
||||
|
|
Загрузка…
Ссылка в новой задаче