Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2170)

Unified Diff: chrome/browser/ui/webui/about_ui.cc

Issue 9652017: [chromeos] Fix chrome://cryptohome crash (Closed) Base URL: http://git.chromium.org/git/chromium/src@master
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/about_ui.cc
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index a7cac4ff66bd683d9738f3d554fae32bf0b8c858..4b754a089a3b8839a748c335e1d4f6495ec90af0 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -535,11 +535,12 @@ void FinishCryptohomeDataRequestInternal(
output.append(AddBoolRow("Pkcs11IsTpmTokenReady", is_tpm_token_ready));
output.append("</table>");
- std::string token_name, user_pin;
- crypto::GetTPMTokenInfo(&token_name, &user_pin);
output.append("<h3>crypto:</h3>");
output.append("<table>");
output.append(AddBoolRow("IsTPMTokenReady", crypto::IsTPMTokenReady()));
+ std::string token_name, user_pin;
+ if (crypto::IsTPMTokenReady())
+ crypto::GetTPMTokenInfo(&token_name, &user_pin);
output.append(AddStringRow("token_name", token_name));
output.append(AddStringRow("user_pin", std::string(user_pin.length(), '*')));
output.append("</table>");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698