1 files changed, 5 insertions, 0 deletions
diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index 3a8ac420b..459b8cc81 100644
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -460,6 +460,11 @@ main(argc,argv)
 	free(new_password);
         goto finish;
     }
+    if (new_pwsize == 0) {
+	fprintf(stderr, "A null password is not allowed!\n");
+	free(new_password);
+	goto finish;
+    }
 #endif
 
     inbuf.data = new_password;