contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords
authorBrandon Casey <drafnel@gmail.com>
Mon, 23 Sep 2013 18:49:12 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Oct 2013 16:35:32 +0000 (09:35 -0700)
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>
contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index d8a7038a6e938bf2338cc5d26fb7e905ef5972e1..5e79669469120dda3a0dd48fb3cbc5f91321b00a 100644 (file)
@@ -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;
 }