summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-05-12 11:44:50 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-05-12 11:44:50 +0200
commitf5a3d0095a5937c14c509a588eb6b7e946faf0c1 (patch)
treeaa87ed1d128f9725409332aac20e4f296be2cf41
parent6248b28e9c9013e074120ae74b6a9fccee75c318 (diff)
* methods/gpgv.cc:
- remove the keyrings count limit by using vector magic
-rw-r--r--debian/changelog2
-rw-r--r--methods/gpgv.cc42
2 files changed, 19 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index 845a37581..a328c1e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
- remove targets refering to CVS or arch as they are useless
* apt-pkg/depcache.cc:
- be doublesure that the killer query is empty before starting reinstall
+ * methods/gpgv.cc:
+ - remove the keyrings count limit by using vector magic
[ Jari Aalto ]
* debian/rules:
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index c58e6cc45..a149d67dd 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -12,6 +12,8 @@
#include <iostream>
#include <sstream>
+#include <vector>
+
#define GNUPGPREFIX "[GNUPG:]"
#define GNUPGBADSIG "[GNUPG:] BADSIG"
#define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY"
@@ -87,23 +89,18 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
return string("Couldn't spawn new process") + strerror(errno);
else if (pid == 0)
{
- const char *Args[400];
- unsigned int i = 0;
+ std::vector<const char *> Args;
+ Args.reserve(30);
- Args[i++] = gpgvpath.c_str();
- Args[i++] = "--status-fd";
- Args[i++] = "3";
- Args[i++] = "--ignore-time-conflict";
+ Args.push_back(gpgvpath.c_str());
+ Args.push_back("--status-fd");
+ Args.push_back("3");
+ Args.push_back("--ignore-time-conflict");
for (vector<string>::const_iterator K = keyrings.begin();
K != keyrings.end(); ++K)
{
- Args[i++] = "--keyring";
- Args[i++] = K->c_str();
- // check overflow (minus a bit of extra space at the end)
- if(i >= sizeof(Args)/sizeof(char*)-5) {
- std::clog << _("E: Too many keyrings should be passed to gpgv. Exiting.") << std::endl;
- exit(111);
- }
+ Args.push_back("--keyring");
+ Args.push_back(K->c_str());
}
Configuration::Item const *Opts;
@@ -115,23 +112,18 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
{
if (Opts->Value.empty() == true)
continue;
- Args[i++] = Opts->Value.c_str();
- // check overflow (minus a bit of extra space at the end)
- if(i >= sizeof(Args)/sizeof(char*)-5) {
- std::clog << _("E: Argument list from Acquire::gpgv::Options too long. Exiting.") << std::endl;
- exit(111);
- }
+ Args.push_back(Opts->Value.c_str());
}
}
- Args[i++] = file;
- Args[i++] = outfile;
- Args[i++] = NULL;
+ Args.push_back(file);
+ Args.push_back(outfile);
+ Args.push_back(NULL);
if (Debug == true)
{
std::clog << "Preparing to exec: " << gpgvpath;
- for(unsigned int j=0;Args[j] != NULL; j++)
- std::clog << " " << Args[j];
+ for(std::vector<const char *>::const_iterator a = Args.begin();*a != NULL; ++a)
+ std::clog << " " << *a;
std::clog << std::endl;
}
int const nullfd = open("/dev/null", O_RDONLY);
@@ -145,7 +137,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
putenv((char *)"LANG=");
putenv((char *)"LC_ALL=");
putenv((char *)"LC_MESSAGES=");
- execvp(gpgvpath.c_str(), (char **)Args);
+ execvp(gpgvpath.c_str(), (char **) &Args[0]);
exit(111);
}