From aa1f95c3d0e729a37bfb4a9befb1904e81e46ea5 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Jan 2012 17:02:34 +0100
Subject: [PATCH] losetup: make xgetpass more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 include/c.h    | 1 +
 lib/xgetpass.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/c.h b/include/c.h
index 073615ef3e..b6d8cedafa 100644
--- 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 8587681489..ba2089470c 100644
--- 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;
 	}
 
-- 
2.47.3