summaryrefslogtreecommitdiffstats
path: root/libblkid/src/encode.c
diff options
context:
space:
mode:
authorKarel Zak2012-12-04 12:12:54 +0100
committerKarel Zak2012-12-04 12:12:54 +0100
commite343695663e8c43601d25e10eccf68969288ad9b (patch)
tree62a185b585c9fd33efaac92fa5ae9078ca3a3ae5 /libblkid/src/encode.c
parentlibblkid: cleanup nonnull attribute usage (diff)
downloadkernel-qcow2-util-linux-e343695663e8c43601d25e10eccf68969288ad9b.tar.gz
kernel-qcow2-util-linux-e343695663e8c43601d25e10eccf68969288ad9b.tar.xz
kernel-qcow2-util-linux-e343695663e8c43601d25e10eccf68969288ad9b.zip
libblkid: cleanup arguments checks
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/encode.c')
-rw-r--r--libblkid/src/encode.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libblkid/src/encode.c b/libblkid/src/encode.c
index 9a0570e8f..ff57be4cb 100644
--- a/libblkid/src/encode.c
+++ b/libblkid/src/encode.c
@@ -284,7 +284,7 @@ int blkid_encode_string(const char *str, char *str_enc, size_t len)
{
size_t i, j;
- if (str == NULL || str_enc == NULL)
+ if (!str || !str_enc || !len)
return -1;
for (i = 0, j = 0; str[i] != '\0'; i++) {
@@ -332,6 +332,8 @@ err:
*/
int blkid_safe_string(const char *str, char *str_safe, size_t len)
{
+ if (!str || !str_safe || !len)
+ return -1;
replace_whitespace(str, str_safe, len);
replace_chars(str_safe, UDEV_ALLOWED_CHARS_INPUT);
return 0;