]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdmap: fix osdmap dump null check
authorSage Weil <sage@inktank.com>
Tue, 9 Oct 2012 03:49:41 +0000 (20:49 -0700)
committerSage Weil <sage@inktank.com>
Tue, 9 Oct 2012 03:49:41 +0000 (20:49 -0700)
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>
src/osd/OSDMap.cc

index 6ad50c25e2db4e53ec001da1b14399eacecd720b..62411bfdcab891d5461f9ee790d293e2bbe19deb 100644 (file)
@@ -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)