diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-10-12 14:44:09 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-10-12 14:44:09 +0200 |
| commit | e74ff795d39894268c737c4b1864869dadb74ed1 (patch) | |
| tree | 7392c70631ead5e38f9f4ed23a5c198dc5673227 | |
| parent | 24fd9c0645b34ebb433588582d4e593cfcc5427a (diff) | |
| parent | 7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff) | |
merged lp:~mvo/apt/mvo
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 21 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 20 insertions, 5 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 56e59d84b..2321ef063 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -15,6 +15,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <iostream> @@ -39,8 +40,8 @@ enum { }; /* make sure we have room for at least this size: */ -#define LOGINSIZE 64 -#define PASSWORDSIZE 64 +#define LOGINSIZE 256 +#define PASSWORDSIZE 256 #define NETRC DOT_CHAR "netrc" /* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */ @@ -122,11 +123,21 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL) if (specific_login) state_our_login = !strcasecmp (login, tok); else + { + if (strlen(tok) > LOGINSIZE) + _error->Error("login token too long %i (max: %i)", + strlen(tok), LOGINSIZE); strncpy (login, tok, LOGINSIZE - 1); + } state_login = 0; } else if (state_password) { - if (state_our_login || !specific_login) + if (state_our_login || !specific_login) + { + if (strlen(tok) > PASSWORDSIZE) + _error->Error("password token too long %i (max %i)", + strlen(tok), PASSWORDSIZE); strncpy (password, tok, PASSWORDSIZE - 1); + } state_password = 0; } else if (!strcasecmp ("login", tok)) state_login = 1; @@ -162,8 +173,8 @@ void maybe_add_auth (URI &Uri, string NetRCFile) { if (NetRCFile.empty () == false) { - char login[64] = ""; - char password[64] = ""; + char login[LOGINSIZE] = ""; + char password[PASSWORDSIZE] = ""; char *netrcfile = strdup(NetRCFile.c_str()); // first check for a generic host based netrc entry diff --git a/debian/changelog b/debian/changelog index 607dddcfa..ea7de55d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ apt (0.9.7.6) UNRELEASED; urgency=low APT::Cache::ShowVersion is true (default: false) as discussed in #218995 to help debian-cd fixing #687949. Thanks to Sam Lidder for initial patch and Steve McIntyre for nagging and testing! + + [ Michael Vogt ] + * increase the maximum netrc login/password size and show proper + error message on overflow -- David Kalnischkies <kalnischkies@gmail.com> Wed, 19 Sep 2012 11:29:56 +0200 |