1 files changed, 49 insertions, 17 deletions

diff --git a/lib/env.c b/lib/env.c
index 83152e4..b1da177 100644
--- a/lib/env.c
+++ b/lib/env.c
@@ -91,34 +91,45 @@ gray_env_read_tr(const char *file_name, struct gray_env **penv, char **trmap)
 	if (!fp) {
 		_pam_log(LOG_ERR, "cannot open configuration file `%s': %s",
 			 file_name, strerror (errno));
 		return 1;
 	}
 
-	while (p = fgets(buf, sizeof buf, fp)) {
+	while ((p = fgets(buf, sizeof buf, fp))) {
 		int len;
 		struct gray_env *env;
 		
 		line++;
 		while (*p && isspace(*p))
 			p++;
 		len = strlen(p);
 		if (len == 0)
 			continue;
 		if (p[len-1] != '\n') {
-			if (!slist)
+			if (!slist) {
 				slist = gray_slist_create();
-			gray_slist_append(slist, p, len);
-			while (p = fgets(buf, sizeof buf, fp)) {
+				if (!slist) {
+					rc = errno;
+					break;
+				}
+			}
+			if (gray_slist_append(slist, p, len) != len) {
+				rc = errno;
+				break;
+			}
+			while ((p = fgets(buf, sizeof buf, fp))) {
 				len = strlen(p);
 				gray_slist_append(slist, p, len);
 				if (p[len - 1] == '\n')
 					break;
 			} 
-			gray_slist_append_char(slist, 0);
-			p = gray_slist_finish(slist);
+			if (gray_slist_append_char(slist, 0) != 1
+			    || (p = gray_slist_finish(slist)) == NULL) {
+				rc = errno;
+				break;
+			}
 			len = strlen(p);
 		}
 
 		p[len-1] = 0;
 		len = gray_trim_ws(p);
 			
@@ -126,16 +137,25 @@ gray_env_read_tr(const char *file_name, struct gray_env **penv, char **trmap)
 			continue;
 
 		if (p[len-1] == '\\') {
 			int err = 0;
 			
 			/* Collect continuation lines */
-			if (!slist)
+			if (!slist) {
 				slist = gray_slist_create();
+				if (!slist) {
+					rc = errno;
+					break;
+				}
+			}	
 			do {
-				gray_slist_append(slist, p, len - 1);
+				if (gray_slist_append(slist, p, len - 1)
+				    != len - 1) {
+					rc = errno;
+					break;
+				}
 				p = fgets (buf, sizeof buf, fp);
 				if (!p)
 					break;
 				line++;
 				len = strlen(p);
 				if (len == 0)
@@ -147,32 +167,39 @@ gray_env_read_tr(const char *file_name, struct gray_env **penv, char **trmap)
 					err = 1; 
 					break;
 				}
 				p[len-1] = 0;
 				len = gray_trim_ws(p);
 			} while (p[len-1] == '\\');
-			if (len)
-				gray_slist_append(slist, p, len);
-			gray_slist_append_char(slist, 0);
-			p = gray_slist_finish(slist);
+			if (rc)
+				break;
+			if (len) {
+				if (gray_slist_append(slist, p, len) != len) {
+					rc = errno;
+					break;
+				}
+			}
+			if (gray_slist_append_char(slist, 0) != 1
+			    || (p = gray_slist_finish(slist)) == NULL) {
+				rc = errno;
+				break;
+			}
 			if (err)
 				continue;
 		}
 		
 		env = malloc(sizeof *env);
 		if (!env) {
-			_pam_log(LOG_EMERG, "not enough memory");
-			rc = 1;
+			rc = errno;
 			break;
 		}
 
 		env->name = strdup(p);
 		if (!env->name) {
-			_pam_log(LOG_EMERG, "not enough memory");
+			rc = errno;
 			free(env);
-			rc = 1;
 			break;
 		}
 
 		for (p = env->name; *p && !isspace(*p); p++) 
 			;
 		if (*p)
@@ -192,13 +219,18 @@ gray_env_read_tr(const char *file_name, struct gray_env **penv, char **trmap)
 		env->next = config_env;
 		config_env = env;
 	}
 
 	gray_slist_free(&slist);
 	fclose(fp);
-	*penv = config_env;
+	if (rc) {
+		_pam_log(LOG_EMERG, "%s", strerror(rc));
+		gray_env_free(config_env);
+	} else {
+		*penv = config_env;
+	}
 	return rc;
 }
 
 int
 gray_env_read(const char *file_name, struct gray_env **penv)
 {