summaryrefslogtreecommitdiff
path: root/contrib/credential
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-09-23 18:49:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-16 16:35:32 (GMT)
commitda2727f23c68fb8cbda3cbd03e81141531166585 (patch)
tree5f30fdb81389d7d6ccb85aa3f32173be0d2cdd20 /contrib/credential
parent9fe3e6cf9e5e3dbf8777dd78dbd27c44cfc4eb85 (diff)
downloadgit-da2727f23c68fb8cbda3cbd03e81141531166585.zip
git-da2727f23c68fb8cbda3cbd03e81141531166585.tar.gz
git-da2727f23c68fb8cbda3cbd03e81141531166585.tar.bz2
contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
gnome-keyring provides functions to allocate non-pageable memory (if possible). Let's use them to allocate memory that may be used to hold secure data read from the keyring. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/credential')
-rw-r--r--contrib/credential/gnome-keyring/git-credential-gnome-keyring.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index d8a7038..5e79669 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -289,12 +289,14 @@ static void credential_clear(struct credential *c)
static int credential_read(struct credential *c)
{
- char buf[1024];
+ char *buf;
size_t line_len;
- char *key = buf;
+ char *key;
char *value;
- while (fgets(buf, sizeof(buf), stdin))
+ key = buf = gnome_keyring_memory_alloc(1024);
+
+ while (fgets(buf, 1024, stdin))
{
line_len = strlen(buf);
@@ -307,6 +309,7 @@ static int credential_read(struct credential *c)
value = strchr(buf,'=');
if (!value) {
warning("invalid credential line: %s", key);
+ gnome_keyring_memory_free(buf);
return -1;
}
*value++ = '\0';
@@ -339,6 +342,9 @@ static int credential_read(struct credential *c)
* learn new lines, and the helpers are updated to match.
*/
}
+
+ gnome_keyring_memory_free(buf);
+
return 0;
}