apt/apt-pkg/contrib, branch 2.3.8

srvrec: Keep support for older resolver

2021-03-20T19:33:34Z

Some C libraries e.g. musl do not implement the new res_n* APIs therefore keep the old implementation as fallback and check __RES version macro to determine the API level Signed-off-by: Khem Raj Cc: Julian Andres Klode

RunScripts: Do not reset SIGQUIT and SIGINT to SIG_DFL

2021-03-01T20:26:24Z

This caused python-apt to unset the Python signal handler when running update or install commands, breaking KeyboardInterrupt amongst possibly other things. We do not set those signal handlers in this functions, and the calling functions restore signal handlers to previous ones. LP: #1898026

configuration: Add missing #include

2021-02-24T09:47:51Z

As user "DaOfficialRolex" on GitHub pointed out: This is needed to allow for APT on iOS to compile correctly. If not included the two following errors happen while compiling APT. ~/apt/apt-pkg/contrib/configuration.cc:900:44: error: constexpr variable cannot have non-literal type 'const std::array' constexpr std::array magicComments { "clear"_sv, "include"_sv, "x-apt-configure-index"_sv }; ^ ~/apt/apt-pkg/contrib/configuration.cc:900:44: error: implicit instantiation of undefined template 'std::__1::array' /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__tuple:219:64: note: template is declared here template struct _LIBCPP_TEMPLATE_VIS array; ^

Replace PrintStatus with SendMessage usage

2021-02-04T10:00:00Z

varg API is a nightmare as the symbols seems different on ever other arch, but more importantly SendMessage does a few checks on the content of the message and it is all outputted via C++ iostreams and not mixed in FILE* which is handy for overriding the streams.

Avoid undefined pointer arithmetic while growing mmap

2021-02-04T10:00:00Z

The undefined behaviour sanitizer complains with: runtime error: addition of unsigned offset to 0x… overflowed to 0x… Compilers and runtime do the right thing in any case and it is a codepath that can (and ideally should) be avoided for speed reasons alone, but fixing it can't hurt (too much).

Avoid overstepping bounds in config file parsing

2021-02-03T16:43:13Z

Our configuration files are not security relevant, but having a parser which avoids crashing on them even if they are seriously messed up is not a bad idea anyway. It is also a good opportunity to brush up the code a bit avoiding a few small string copies with our string_view.

Forbid negative values in unsigned StrToNum explicitly

2021-02-03T16:36:46Z

strtoul(l) surprises us with parsing negative values which should not exist in the places we use to parse them, so we can just downright refuse them rather than trying to work with them by having them promoted to huge positive values.

Remove Word size limit from ParseQuote and CWord

2021-02-03T16:36:45Z

It isn't super likely that we will encounter such big words in the real world, but we can return arbitrary length, so lets just do that as that also means we don't have to work with a second buffer.

Don't parse \x and \0 past the end in DeEscapeString

2021-02-03T16:36:45Z

This has no attack surface though as the loop is to end very soon anyhow and the method only used while reading CD-ROM mountpoints which seems like a very unlikely attack vector…

Fix incorrect base64 encoding due to int promotion

2021-02-03T16:36:45Z

For \xff and friends with the highest bit set and hence being a negative value on signed char systems the wrong encoding is produced as we run into undefined behaviour accessing negative array indexes. We can avoid this problem simply by using an unsigned data type.