summaryrefslogtreecommitdiff
path: root/source4/smb_server/smb2/find.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-02-18 14:54:14 +1100
committerAndrew Tridgell <tridge@samba.org>2008-02-18 14:54:14 +1100
commit5fb241e5d33024dd7af1e7ec5cbdefbf144be6a1 (patch)
tree13fc08f8e302d9772702debe115380e71946bf4c /source4/smb_server/smb2/find.c
parent26b8701321909e10aac124324695f9f4891b1f8d (diff)
downloadsamba-5fb241e5d33024dd7af1e7ec5cbdefbf144be6a1.tar.gz
samba-5fb241e5d33024dd7af1e7ec5cbdefbf144be6a1.tar.bz2
samba-5fb241e5d33024dd7af1e7ec5cbdefbf144be6a1.zip
3 places where the VFS backend doesn't handle NULL strings.
(This used to be commit cf109460aff5a8437ab7eba05e4d7316a131080e)
Diffstat (limited to 'source4/smb_server/smb2/find.c')
-rw-r--r--source4/smb_server/smb2/find.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/smb_server/smb2/find.c b/source4/smb_server/smb2/find.c
index c594adf7a0..6018f1958f 100644
--- a/source4/smb_server/smb2/find.c
+++ b/source4/smb_server/smb2/find.c
@@ -161,6 +161,11 @@ void smb2srv_find_recv(struct smb2srv_request *req)
SMB2SRV_CHECK(smb2_pull_o16s16_string(&req->in, info, req->in.body+0x18, &info->in.pattern));
info->in.max_response_size = IVAL(req->in.body, 0x1C);
+ /* the VFS backend does not yet handle NULL patterns */
+ if (info->in.pattern == NULL) {
+ info->in.pattern = "";
+ }
+
SMB2SRV_CHECK_FILE_HANDLE(info->in.file.ntvfs);
SMB2SRV_CALL_NTVFS_BACKEND(smb2srv_find_backend(state));
}