losetup: make xgetpass more robust

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/c.h b/include/c.h
index 073615ef3e63acb452105f6134b4b94c5281c914..b6d8cedafa2a0ce43f15a51c150c54523834988c 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -6,6 +6,7 @@
 #define UTIL_LINUX_C_H
 
 #include <limits.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/lib/xgetpass.c b/lib/xgetpass.c
index 8587681489c93d06d9d86acf97ded22e756f0f19..ba2089470c76b018bb4abb41afd5b8b7ccc80dfc 100644 (file)
--- a/lib/xgetpass.c
+++ b/lib/xgetpass.c
@@ -34,8 +34,8 @@ char *xgetpass(int pfd, const char *prompt)
                                break;
                        }
                }
-               if (read(pfd, pass + i, 1) != 1 ||
-                   pass[i] == '\n' || pass[i] == 0)
+               if (pass && (read(pfd, pass + i, 1) != 1 ||
+                            pass[i] == '\n' || pass[i] == 0))
                        break;
        }