From 0e63a1f69d962f48c0e8e69fe91a0813b251fadf Mon Sep 17 00:00:00 2001
From: Chris Oei <zlkm208-scryptgenpass@yahoo.com>
Date: Mon, 3 Sep 2012 12:29:55 -0700
Subject: [PATCH] Fixed error handling for unreadable keyfiles

---
 main.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/main.c b/main.c
index 565d443..c9c7942 100644
--- a/main.c
+++ b/main.c
@@ -128,15 +128,20 @@ main(int argc, char *argv[])
 				memset(passwd, 0, passwdlen);
 				free(passwd);
 				size_t n  = fread(combinedkey + passwdlen, keyfilelen, 1, fp);
-				/* TODO: check n == number of items read == 1 */
 				fclose(fp);
+				if (n != 1) {
+					warn("Unable to read keyfile");
+					exit(1);
+				}
 				passwd = combinedkey;
 				passwdlen += keyfilelen;
 			} else {
-				rc = 15;
+				warn("Unable to allocate memory for combined key");
+				exit(1);
 			}
 		}	else {
-			rc = 14;
+			warn("Unable to open keyfile %s", keyfile);
+			exit(1);
 		}
 	}