diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 13:53:14 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-07-03 10:38:19 +0300 |
| commit | 5b8cbb8e38f948539d47f11d870efecefc5df9c0 (patch) | |
| tree | 8da46e6ad8510552e43c9a5a6250b720547317ff /usr/src/lib/libzfs/common/libzfs_sendrecv.c | |
| parent | baf3abb99faf2cc8376a1f8ab38dfa1730c2ca13 (diff) | |
| download | illumos-gate-5b8cbb8e38f948539d47f11d870efecefc5df9c0.tar.gz | |
11156 libzfs: NULL pointer errors
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_sendrecv.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index a25574cc19..27f05f101e 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -3548,7 +3548,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, DMU_BACKUP_FEATURE_RAW; boolean_t embedded = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) & DMU_BACKUP_FEATURE_EMBED_DATA; - stream_wantsnewfs = (drrb->drr_fromguid == NULL || + stream_wantsnewfs = (drrb->drr_fromguid == 0 || (drrb->drr_flags & DRR_FLAG_CLONE) || originsnap) && !resuming; if (stream_wantsnewfs) { |