diff mbox

[1/2] fix null deref when callback invoked en route from readdir_r rather than readdirplus_r

Message ID 1305268778-18691-2-git-send-email-brchrisman@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Brian Chrisman May 13, 2011, 6:39 a.m. UTC 
Signed-off-by: Brian Chrisman <brchrisman@gmail.com>
---
 src/client/Client.cc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 8b8fcf1..dbac2c9 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4330,8 +4330,12 @@  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;  
 }