From: Brian Chrisman <brchrisman@gmail.com>
Date: Fri, 13 May 2011 06:39:37 +0000 (-0700)
Subject: fix null deref when callback invoked en route from readdir_r rather than readdirplus_r
X-Git-Tag: v0.29~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8161122b1f6b192c2ed634dc461be9b470ba42be;p=ceph.git

fix null deref when callback invoked en route from readdir_r rather than readdirplus_r

Signed-off-by: Brian Chrisman <brchrisman@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index eec9253f3b32..41ddcf4a5d96 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4325,8 +4325,10 @@ static int _readdir_single_dirent_cb(void *p, struct dirent *de, struct stat *st
     return -1;
 
   *c->de = *de;
-  *c->st = *st;
-  *c->stmask = stmask;
+  if (c->st)
+    *c->st = *st;
+  if (c->stmask)
+    *c->stmask = stmask;
   c->full = true;
   return 0;  
 }