From 4f6f505900a0b8c2e16955b5eb69a9213fc6076d Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 1 Feb 2016 10:08:33 -0800 Subject: [PATCH] Fix null pointer check in tokenFilename() From https://scan.coverity.com/projects/chromium-ec : CID61407: Dereference after null check The home directory that is received from getpwuid() needs to be assigned to home but it wasn't. BUG=none BRANCH=none TEST=build tested Signed-off-by: Stefan Reinauer Change-Id: I36c30906e1388e2f8a0d466d516a5ffa6ae70bf6 Reviewed-on: https://chromium-review.googlesource.com/324637 Commit-Ready: Stefan Reinauer Tested-by: Stefan Reinauer Reviewed-by: Vadim Bendebury --- util/signer/gnubby.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/signer/gnubby.cc b/util/signer/gnubby.cc index a1fa158a22..549daa319c 100644 --- a/util/signer/gnubby.cc +++ b/util/signer/gnubby.cc @@ -294,7 +294,8 @@ void getPIN(uint8_t* out) { static std::string tokenFilename(const uint8_t* fp) { const char* home = getenv("HOME"); - if (home == NULL) getpwuid(getuid())->pw_dir; + if (home == NULL) + home = getpwuid(getuid())->pw_dir; std::string s(home); s.append("/.tmp/"); for (int i = 0; i < 32; ++i) {