git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
95c81fe
)
vfs_fruit: Fix CID 1416474 Dereference null return value
author
Volker Lendecke
<vl@samba.org>
Tue, 10 Apr 2018 19:05:09 +0000
(21:05 +0200)
committer
Jeremy Allison
<jra@samba.org>
Wed, 11 Apr 2018 17:07:24 +0000
(19:07 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/modules/vfs_fruit.c
patch
|
blob
|
history
diff --git
a/source3/modules/vfs_fruit.c
b/source3/modules/vfs_fruit.c
index 4299583b21be4f070aa7a706a05fa571799fe9eb..0a8141a9e515875a73655a6ffa3d80ec6958bb14 100644
(file)
--- a/
source3/modules/vfs_fruit.c
+++ b/
source3/modules/vfs_fruit.c
@@
-4065,6
+4065,11
@@
static ssize_t fruit_pread_rsrc(vfs_handle_struct *handle,
struct fio *fio = (struct fio *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
ssize_t nread;
+ if (fio == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
+
switch (fio->config->rsrc) {
case FRUIT_RSRC_STREAM:
nread = fruit_pread_rsrc_stream(handle, fsp, data, n, offset);