From b8476a30d7581ead9ed2371ccde57b4637341810 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Thu, 6 Feb 2020 06:41:22 +0900 Subject: [PATCH] ntfs: Fix PVS V595 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Check pointers against NULL befor using them. Change-Id: I84fc7d60179fff46f78302e212bbcf7e5105126b Reviewed-on: https://review.haiku-os.org/c/haiku/+/2223 Reviewed-by: Jérôme Duval --- .../kernel/file_systems/ntfs/volume_util.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/file_systems/ntfs/volume_util.c b/src/add-ons/kernel/file_systems/ntfs/volume_util.c index 59dda3d982..5c9fe8855b 100644 --- a/src/add-ons/kernel/file_systems/ntfs/volume_util.c +++ b/src/add-ons/kernel/file_systems/ntfs/volume_util.c @@ -64,17 +64,22 @@ static uint8 ntfs_count_bits(unsigned char byte, unsigned char shift) int ntfs_calc_free_space(nspace *_ns) { nspace *ns = (nspace*)_ns; - ntfs_volume *vol = ns->ntvol; - ntfs_attr *data = vol->lcnbmp_na; + ntfs_volume *vol; + ntfs_attr *data; s64 free_clusters = 0; off_t pos = 0; size_t readed; - unsigned char *buf = NULL; - - if (ns == NULL || vol == NULL || data == NULL) + unsigned char *buf; + + if (ns == NULL) return -1; - - if (vol->lcnbmp_na == NULL) + + vol = ns->ntvol; + if (vol == NULL) + return -1; + + data = vol->lcnbmp_na; + if (data == NULL) return -1; if (!(ns->state & NF_FreeClustersOutdate))