* apt-pkg/contrib/error.cc:

  - ensure that va_list is not invalid in second try

1 files changed, 32 insertions, 0 deletions

diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index b2752255f..7d933f5a8 100644
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -2,6 +2,7 @@
 
 #include "assert.h"
 #include <string>
+#include <errno.h>
 
 int main(int argc,char *argv[])
 {
@@ -73,5 +74,36 @@ int main(int argc,char *argv[])
 	equals(text, "A Warning");
 	equals(_error->empty(), true);
 
+	errno = 0;
+	equals(_error->Errno("errno", "%s horrible %s %d times", "Something", "happend", 2), false);
+	equals(_error->empty(), false);
+	equals(_error->PendingError(), true);
+	equals(_error->PopMessage(text), true);
+	equals(_error->PendingError(), false);
+	equals(text, "Something horrible happend 2 times - errno (0: Success)");
+	equals(_error->empty(), true);
+
+	std::string longText;
+	for (size_t i = 0; i < 500; ++i)
+		longText.append("a");
+	equals(_error->Error("%s horrible %s %d times", longText.c_str(), "happend", 2), false);
+	equals(_error->PopMessage(text), true);
+	equals(text, std::string(longText).append(" horrible happend 2 times"));
+
+	equals(_error->Errno("errno", "%s horrible %s %d times", longText.c_str(), "happend", 2), false);
+	equals(_error->PopMessage(text), true);
+	equals(text, std::string(longText).append(" horrible happend 2 times - errno (0: Success)"));
+
+	equals(_error->Warning("Репозиторий не обновлён и будут %d %s", 4, "test"), false);
+	equals(_error->PopMessage(text), false);
+	equals(text, "Репозиторий не обновлён и будут 4 test");
+
+	longText.clear();
+	for (size_t i = 0; i < 50; ++i)
+		longText.append("РезийбёбAZ");
+	equals(_error->Warning(longText.c_str()), false);
+	equals(_error->PopMessage(text), false);
+	equals(text, longText);
+
 	return 0;
 }