зеркало из https://github.com/mozilla/gecko-dev.git
Bug 593106 - attempt to work around a strange behavior where some string is null which should never be null, r=Mossop a=blocker
This commit is contained in:
Родитель
86125b1d23
Коммит
34ac912694
|
@ -610,18 +610,17 @@ nsCommandLine::EnumerateHandlers(EnumerateHandlersCallback aCallback, void *aClo
|
||||||
while (NS_SUCCEEDED(strenum->HasMore(&hasMore)) && hasMore) {
|
while (NS_SUCCEEDED(strenum->HasMore(&hasMore)) && hasMore) {
|
||||||
strenum->GetNext(entry);
|
strenum->GetNext(entry);
|
||||||
|
|
||||||
nsXPIDLCString contractID;
|
nsCString contractID;
|
||||||
rv = catman->GetCategoryEntry("command-line-handler",
|
rv = catman->GetCategoryEntry("command-line-handler",
|
||||||
entry.get(),
|
entry.get(),
|
||||||
getter_Copies(contractID));
|
getter_Copies(contractID));
|
||||||
if (!contractID)
|
if (NS_FAILED(rv))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
nsCOMPtr<nsICommandLineHandler> clh(do_GetService(contractID.get()));
|
nsCOMPtr<nsICommandLineHandler> clh(do_GetService(contractID.get()));
|
||||||
if (!clh) {
|
if (!clh) {
|
||||||
LogConsoleMessage(NS_LITERAL_STRING("Contract ID '%s' was registered as a command line handler for entry '%s', but could not be created."),
|
LogConsoleMessage(NS_LITERAL_STRING("Contract ID '%s' was registered as a command line handler for entry '%s', but could not be created."),
|
||||||
contractID.get(),
|
contractID.get(), entry.get());
|
||||||
entry.get());
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче