summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-26 16:42:54 +0200
committerToomas Soome <tsoome@me.com>2019-07-30 21:22:14 +0300
commit9292c78d437d97bc5dd20bc4d6788a79e0661e02 (patch)
tree3ed797d0ca5abd9d1931acfa5fbd9d275e3267e7
parent7bc3049f70ccb68ec7cd7ba1bb17a4643fb60f36 (diff)
downloadillumos-joyent-9292c78d437d97bc5dd20bc4d6788a79e0661e02.tar.gz
11419 rmformat: NULL pointer errors
Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/cmd/rmformat/rmf_slice.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/rmformat/rmf_slice.c b/usr/src/cmd/rmformat/rmf_slice.c
index ec8d5209e0..bac5da9ca4 100644
--- a/usr/src/cmd/rmformat/rmf_slice.c
+++ b/usr/src/cmd/rmformat/rmf_slice.c
@@ -758,7 +758,7 @@ str2sector(char *str)
mul_factor = 1024;
s1++;
}
- if ((*s1 != 'B') || (*(++s1) != NULL)) {
+ if ((*s1 != 'B') || (*(++s1) != '\0')) {
(void) fprintf(stderr,
gettext("Extra chars at the end\n"));
free(base);
@@ -770,7 +770,7 @@ str2sector(char *str)
*s2 = '\0';
}
}
- *s2 = NULL;
+ *s2 = '\0';
size = my_atoll(base);
if ((!mul_factor) || (size == -1)) {