From: Sage Weil <sage@inktank.com>
Date: Tue, 9 Oct 2012 03:49:41 +0000 (-0700)
Subject: osdmap: fix osdmap dump null check
X-Git-Tag: v0.54~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0406d0c53a8cfb9e32c4c6df8901d536a43db18d;p=ceph.git

osdmap: fix osdmap dump null check

CID 731939 (#1 of 1): Dereference after null check (FORWARD_NULL)
At (5): Passing null pointer "out" to function "std::operator << <std::char_traits<char> >(std::basic_ostream<char, std::char_traits<char> > &, char const *)", which dereferences it.

Broken by 13b841c74605d67a172d787079bcef007d1a8fa5.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 6ad50c25e2d..62411bfdcab 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1440,7 +1440,8 @@ void OSDMap::print_osd_line(int cur, ostream *out, Formatter *f) const
   if (out)
     *out << "osd." << cur << "\t";
   if (!exists(cur)) {
-    *out << "DNE\t\t";
+    if (out)
+      *out << "DNE\t\t";
   } else {
     if (is_up(cur)) {
       if (out)