Merge lp:~colin-king/ecryptfs/memleaks into lp:ecryptfs

[Colin Ian King]

A couple of minor fixes: Fix a memory leak and handle out of memory error, as found by using cppcheck.

=== modified file 'src/libecryptfs/key_management.c'
--- src/libecryptfs/key_management.c	2013-10-27 16:52:03 +0000
+++ src/libecryptfs/key_management.c	2014-02-28 15:04:17 +0000
@@ -76,6 +76,9 @@
 	if (rc) {
 		syslog(LOG_ERR, "Error generating payload for auth tok key; "
 		       "rc = [%d]\n", rc);
+		memset(*auth_tok, 0, sizeof(struct ecryptfs_auth_tok));
+		free(*auth_tok);
+		*auth_tok = NULL;
 		rc = (rc < 0) ? rc : rc * -1;
 		goto out;
 	}

=== modified file 'src/utils/mount.ecryptfs.c'
--- src/utils/mount.ecryptfs.c	2013-10-27 22:33:19 +0000
+++ src/utils/mount.ecryptfs.c	2014-02-28 15:04:17 +0000
@@ -576,6 +576,12 @@
 		goto out;
 	}
 	mnt_params = malloc(sizeof(struct val_node));
+	if (!mnt_params) {
+		fprintf(stderr, "Unable to allocate memory for mount "
+			"parameters buffer\n");
+			rc = -ENOMEM;
+		goto out;
+	}
 	memset(mnt_params, 0, sizeof(struct val_node));
 	memset(&ctx, 0, sizeof(struct ecryptfs_ctx));
 	ctx.get_string = &get_string_stdin;