Bug 1228482 - Fix compile error with VS2015 and memory leak in nsEdgeReadingListExtractor. r=bas

This commit is contained in:
Xidorn Quan 2015-11-27 16:29:23 +11:00
Родитель b9ec91717e
Коммит 5f08d72a2f
1 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@ -199,12 +199,16 @@ nsEdgeReadingListExtractor::ConvertJETError(const JET_ERR &aError)
return NS_ERROR_FILE_NOT_FOUND;
case JET_errDatabaseDirtyShutdown:
return NS_ERROR_FILE_CORRUPTED;
default:
nsCOMPtr<nsIConsoleService> consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
wchar_t* msg = new wchar_t[80];
swprintf(msg, 80, MOZ_UTF16("Unexpected JET error from ESE database: %ld"), aError);
consoleService->LogStringMessage(msg);
default: {
nsCOMPtr<nsIConsoleService>
consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
static const char16ptr_t
kFormat = MOZ_UTF16("Unexpected JET error from ESE database: %ld");
wchar_t msg[80];
swprintf(msg, mozilla::ArrayLength(msg), kFormat, aError);
consoleService->LogStringMessage(char16ptr_t(msg));
return NS_ERROR_FAILURE;
}
}
}