- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] hook.c: replace readdir_r with readdir
by Andrew Gregory 30 Jun '16

30 Jun '16

glibc 2.24 deprecates readdir_r. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/hook.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index 6890a6e..9b4f215 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -623,10 +623,9 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) int ret = 0; for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { - int err; char path[PATH_MAX]; size_t dirlen; - struct dirent entry, *result; + struct dirent *entry; DIR *d; if((dirlen = strlen(i->data)) >= PATH_MAX) { @@ -648,35 +647,35 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) } } - while((err = readdir_r(d, &entry, &result)) == 0 && result) { + while((errno = 0, entry = readdir(d))) { struct _alpm_hook_cb_ctx ctx = { handle, NULL }; struct stat buf; size_t name_len; - if(strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) { - continue; + if(strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { + continue; } - if((name_len = strlen(entry.d_name)) >= PATH_MAX - dirlen) { + if((name_len = strlen(entry->d_name)) >= PATH_MAX - dirlen) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not open file: %s%s: %s\n"), - path, entry.d_name, strerror(ENAMETOOLONG)); + path, entry->d_name, strerror(ENAMETOOLONG)); ret = -1; continue; } - memcpy(path + dirlen, entry.d_name, name_len + 1); + memcpy(path + dirlen, entry->d_name, name_len + 1); if(name_len < suflen - || strcmp(entry.d_name + name_len - suflen, suffix) != 0) { + || strcmp(entry->d_name + name_len - suflen, suffix) != 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); continue; } - if(find_hook(hooks, entry.d_name)) { + if(find_hook(hooks, entry->d_name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "skipping overridden hook %s\n", path); continue; } - if(fstatat(dirfd(d), entry.d_name, &buf, 0) != 0) { + if(fstatat(dirfd(d), entry->d_name, &buf, 0) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not stat file %s: %s\n"), path, strerror(errno)); ret = -1; @@ -700,11 +699,10 @@ int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) continue; } - STRDUP(ctx.hook->name, entry.d_name, ret = -1; closedir(d); goto cleanup); + STRDUP(ctx.hook->name, entry->d_name, ret = -1; closedir(d); goto cleanup); hooks = alpm_list_add(hooks, ctx.hook); } - - if(err != 0) { + if(errno != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not read directory: %s: %s\n"), (char *) i->data, strerror(errno)); ret = -1; -- 2.9.0

2 1

[pacman-dev] [PATCH] Fix typo in german translation
by Jan-Marten Brüggemann 27 Jun '16

27 Jun '16

This patch fixes a typo in the german translation of pacman. Because the german word for package is "Paket" not "Packet". Signed-off-by: Jan-Marten Brüggemann <brueggemann(a)b1-systems.de> --- src/pacman/po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po index e9c9460..45f594e 100644 --- a/src/pacman/po/de.po +++ b/src/pacman/po/de.po @@ -1354,7 +1354,7 @@ msgstr "Konnte den Vorgang nicht vorbereiten (%s)\n" #: src/pacman/remove.c:125 src/pacman/sync.c:724 #, c-format msgid "%s: removing %s breaks dependency '%s'\n" -msgstr "%s: das Entfernen von %s löscht ein benötigtes Packet von '%s'\n" +msgstr "%s: das Entfernen von %s löscht ein benötigtes Paket von '%s'\n" #: src/pacman/remove.c:144 #, c-format @@ -1494,7 +1494,7 @@ msgstr "%s: benötigt %s\n" #, c-format msgid "%s: installing %s (%s) breaks dependency '%s'\n" msgstr "" -"%s: das Installieren von %s (%s) löscht ein benötigtes Packet von '%s'\n" +"%s: das Installieren von %s (%s) löscht ein benötigtes Paket von '%s'\n" #: src/pacman/sync.c:744 #, c-format -- 2.9.0

4 4

[pacman-dev] [PATCH] Added the --bell switch.
by Eric Toombs 26 Jun '16

26 Jun '16

This switch rings the terminal bell when user input is required. Obviously, it has no effect if --noconfirm is also passed. --- doc/pacman.8.txt | 3 +++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 3 +++ src/pacman/util.c | 15 +++++++++------ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 514f559..6e0617a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -148,6 +148,9 @@ Options *\--arch* <arch>:: Specify an alternate architecture. +*\--bell*:: + Sound the terminal bell when input is required. + *\--cachedir* <dir>:: Specify an alternative package cache location (a typical default is +{localstatedir}/cache/pacman/pkg+). Multiple cache directories can be diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 7a7e9cf..463ae48 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short bell; double deltaratio; char *arch; char *print_format; @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_BELL }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 94685a7..07282e7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -221,6 +221,7 @@ static void usage(int op, const char * const myname) addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); addlist(_(" --confirm always ask for confirmation\n")); + addlist(_(" --bell sound the terminal bell when input is required\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -480,6 +481,7 @@ static int parsearg_global(int opt) case OP_CONFIRM: config->noconfirm = 0; break; + case OP_BELL: config->bell = 1; break; case OP_DBPATH: case 'b': free(config->dbpath); @@ -981,6 +983,7 @@ static int parseargs(int argc, char *argv[]) {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, + {"bell", no_argument, 0, OP_BELL}, {0, 0, 0, 0} }; diff --git a/src/pacman/util.c b/src/pacman/util.c index 5f331e8..9183047 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1396,13 +1396,14 @@ int multiselect_question(char *array, int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a selection (default=all)")); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, response_len, stdin)) { @@ -1463,13 +1464,14 @@ int select_question(int count) fprintf(stream, "\n"); fprintf(stream, _("Enter a number (default=%d)"), preset); fprintf(stream, ": "); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); break; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fileno(stdin)); if(safe_fgets(response, sizeof(response), stdin)) { @@ -1517,13 +1519,14 @@ static int question(short preset, const char *format, va_list args) } fputs(config->colstr.nocolor, stream); - fflush(stream); if(config->noconfirm) { fprintf(stream, "\n"); return preset; + } else if(config->bell) { + fprintf(stream, "\a"); } - + fflush(stream); flush_term_input(fd_in); if(safe_fgets(response, sizeof(response), stdin)) { -- 2.6.2

3 8

[pacman-dev] [PATCH RFC] DWIM if user attempts to sync on a file
by Andrew Eikum 23 Jun '16

23 Jun '16

I get bit by this fairly often when I build AUR packages. From my perspective as a user, the distinction between -U and -S seems irrelevant: I just want to install this package. So let's just have pacman offer to Do What I Mean and install the files if I use -S when I should have used -U. Signed-off-by: Andrew Eikum <coldpie(a)fastmail.com> --- RFC because this lacks tests and maybe UI polish, but I thought I'd see if there's interest in this change before I put more effort into it. --- src/pacman/sync.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 8b30603..faad728 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -619,6 +619,9 @@ static int process_targname(alpm_list_t *dblist, const char *targname, return process_group(dblist, targname, error); } +#define TGT_FAIL 1 +#define TGT_FAIL_IS_FILE 2 + static int process_target(const char *target, int error) { /* process targets */ @@ -639,7 +642,7 @@ static int process_target(const char *target, int error) if(!db) { pm_printf(ALPM_LOG_ERROR, _("database not found: %s\n"), dbname); - ret = 1; + ret = TGT_FAIL; goto cleanup; } @@ -667,6 +670,7 @@ cleanup: pm_printf(ALPM_LOG_WARNING, _("'%s' is a file, did you mean %s instead of %s?\n"), target, "-U/--upgrade", "-S/--sync"); + ret = TGT_FAIL_IS_FILE; } return ret; } @@ -682,14 +686,29 @@ static int sync_trans(alpm_list_t *targets) } /* process targets */ + if(targets) { + retval = -1; + } for(i = targets; i; i = alpm_list_next(i)) { const char *targ = i->data; - if(process_target(targ, retval) == 1) { - retval = 1; + int ret = process_target(targ, retval); + if(retval < 0) { + retval = ret; + }else if(retval != ret) { + retval = TGT_FAIL; + } + } + + if(retval == TGT_FAIL_IS_FILE) { + int confirm = noyes(_("Proceed with install from file(s)?")); + if(confirm) { + trans_release(); + return pacman_upgrade(targets); } + retval = TGT_FAIL; } - if(retval) { + if(retval == TGT_FAIL) { trans_release(); return retval; } -- 2.8.3

6 12

[pacman-dev] [RFC] [PATCH] Implement a du --apparent-size equivalent
by Alastair Hughes 23 Jun '16

23 Jun '16

From: Alastair Hughes <hobbitalastair(a)yandex.com> Add a pkgsize binary which mimics the behaviour of GNU du --apparent-size -skl. Fixes FS#47943. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- I haven't done much C programming before - I'd appreciate any feedback you have. At the moment, this patch creates a new pkgsize binary as an extra utility, and installs with the other utilities. I think that it would be better if it installed it to a libexec dir, but I'm not entirely sure how to do that without making a mess. --- configure.ac | 5 --- scripts/Makefile.am | 2 -- scripts/makepkg.sh.in | 2 +- src/util/.gitignore | 2 ++ src/util/Makefile.am | 4 ++- src/util/pkgsize.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 src/util/pkgsize.c diff --git a/configure.ac b/configure.ac index dd4ac04..ee5f7ea 100644 --- a/configure.ac +++ b/configure.ac @@ -332,7 +332,6 @@ OWNERCMD="stat -c '%u:%g'" MODECMD="stat -c '%a'" SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" -DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" @@ -343,7 +342,6 @@ case "${host_os}" in MODECMD="stat -f '%Lp'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" - DUFLAGS="-sk" ;; darwin*) host_os_darwin=yes @@ -352,7 +350,6 @@ case "${host_os}" in MODECMD="/usr/bin/stat -f '%Lp'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" - DUFLAGS="-sk" STRIP_BINARIES="" STRIP_SHARED="-S" STRIP_STATIC="-S" @@ -360,13 +357,11 @@ case "${host_os}" in esac AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") -AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) AC_SUBST(OWNERCMD) AC_SUBST(MODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) -AC_SUBST(DUFLAGS) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e4f9fb1..ea14e73 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -138,8 +138,6 @@ edit = sed \ -e "s|@MODECMD[@]|$(MODECMD)|g" \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ - -e 's|@DUFLAGS[@]|$(DUFLAGS)|g' \ - -e 's|@DUPATH[@]|$(DUPATH)|g' \ -e 's|@SCRIPTNAME[@]|$@|g' \ -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..249c878 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -605,7 +605,7 @@ write_pkginfo() { local packager="Unknown Packager" fi - local size="$(@DUPATH@ @DUFLAGS@)" + local size="$(pkgsize .)" size="$(( ${size%%[^0-9]*} * 1024 ))" merge_arch_attrs diff --git a/src/util/.gitignore b/src/util/.gitignore index 202fb75..7dbefe8 100644 --- a/src/util/.gitignore +++ b/src/util/.gitignore @@ -6,6 +6,8 @@ pacsort pacsort.exe pactree pactree.exe +pkgsize +pkgsize.exe testpkg testpkg.exe vercmp diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 6a89ea6..84dfce9 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -4,7 +4,7 @@ dbpath = ${localstatedir}/lib/pacman/ gpgdir = ${sysconfdir}/pacman.d/gnupg/ cachedir = ${localstatedir}/cache/pacman/pkg/ -bin_PROGRAMS = vercmp testpkg cleanupdelta pacsort pactree +bin_PROGRAMS = vercmp testpkg cleanupdelta pacsort pactree pkgsize AM_CPPFLAGS = \ -imacros $(top_builddir)/config.h \ @@ -27,6 +27,8 @@ pacsort_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la pactree_SOURCES = pactree.c util-common.c pactree_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +pkgsize_SOURCES = pkgsize.c + testpkg_SOURCES = testpkg.c testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la diff --git a/src/util/pkgsize.c b/src/util/pkgsize.c new file mode 100644 index 0000000..5e1b3fc --- /dev/null +++ b/src/util/pkgsize.c @@ -0,0 +1,88 @@ +/* + * pkgsize.c - a du --apparent-size equivalent for systems without GNU du + * + * Copyright (c) 2016 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/* This is equivalent to "du -skl --apparent-size". + * Unforunately, there appears to be no easy way of ignoring hard links, hence + * the additional '-l' argument. + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <string.h> +#include <stdlib.h> +#include <stdio.h> +#include <dirent.h> +#include <unistd.h> + +static long size(char *path) +{ + long total_size, subsize; + DIR *dir; + struct dirent *entry; + struct stat buf; + + if(lstat(path, &buf) != 0) { return -1; } + + if(S_ISLNK(buf.st_mode) || S_ISREG(buf.st_mode)) { + return buf.st_size; + } else if(S_ISDIR(buf.st_mode)) { + total_size = buf.st_size; + dir = opendir(path); + if(dir == NULL || chdir(path) != 0) { return -1; } + while(entry = readdir(dir)) { + if(strcmp(entry->d_name, "..") == 0 || strcmp(entry->d_name, ".") == 0) { + continue; + } + subsize = size(entry->d_name); + if(subsize == -1) { + closedir(dir); + return -1; + } + total_size += subsize; + } + + closedir(dir); + if(chdir("../") != 0) { return -1; } + return total_size; + } + return 0; +} + +int main(int argc, char *argv[]) +{ + long total_size; + + if(argc != 2) { + printf("Invalid argument count %d!\n", argc - 1); + exit(EXIT_FAILURE); + } + + total_size = size(argv[1]); + if(total_size == -1) { + perror(""); + exit(EXIT_FAILURE); + } + + /* Use KB, rounded up - should be equivalent to the du -k flag */ + printf("%ld %s\n", (total_size / 1024) + (total_size % 1024 != 0), argv[1]); + + exit(EXIT_SUCCESS); +} + +/* vim: set noet: */ -- 2.8.3

3 6

[pacman-dev] [PATCH] Make DUFLAGS be overrideable during configure
by Alastair Hughes 23 Jun '16

23 Jun '16

Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[pacman-dev] [PATCH] Prevent stack overflow on symbolic link access.
by Tobias Stoeckmann 23 Jun '16

23 Jun '16

It is possible (but unlikely) to encounter very long symbolic links, which would take a few mega bytes in size. In general, such long symbolic links are impossible to create because the kernel will only accept up to PATH_MAX in length. BUT lstat() on a maliciously modified symbolic link can return a much larger size than that. In function check_file_link (src/pacman/check.c), the length of a symbolic link is used in a variable length array: char link[length]; // length being st->st_size + 1 This doesn't just allow a very theoretical overflow on 32 bit systems with 64 bit off_t (which is st_size's type), it can also overflow available stack space, leading to a segmentation fault. Symbolic links pointing to something that is longer than PATH_MAX can be considered illegal, so just get a fixed size array and reject symbolic links which are longer than that. --- src/pacman/check.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pacman/check.c b/src/pacman/check.c index d282cc2..6e8cda7 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -132,15 +132,16 @@ static int check_file_time(const char *pkgname, const char *filepath, static int check_file_link(const char *pkgname, const char *filepath, struct stat *st, struct archive_entry *entry) { - size_t length = st->st_size + 1; - char link[length]; + ssize_t len; + char link[PATH_MAX]; - if(readlink(filepath, link, length) != st->st_size) { + len = readlink(filepath, link, sizeof(link)); + if (len == -1 || len >= PATH_MAX) { /* this should not happen */ pm_printf(ALPM_LOG_ERROR, _("unable to read symlink contents: %s\n"), filepath); return 1; } - link[length - 1] = '\0'; + link[len] = '\0'; if(strcmp(link, archive_entry_symlink(entry)) != 0) { if(!config->quiet) { -- 2.8.3

4 22

[pacman-dev] [PATCH] Reject files larger than INT_MAX in read_sigfile.
by Tobias Stoeckmann 23 Jun '16

23 Jun '16

Signature files larger than INT_MAX are already suspicious, but if they are larger than SIZE_MAX, this code couldn't even copy them into memory, accepting them as "blank" files at worst. While adding the INT_MAX check, I also rearranged the code to avoid a quite harmless TOCTOU race condition between stat() and fopen(). Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- lib/libalpm/be_package.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c9ed770..055fb1e 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -700,17 +700,16 @@ static int read_sigfile(const char *sigpath, unsigned char **sig) struct stat st; FILE *fp; - if(stat(sigpath, &st) != 0) { + if((fp = fopen(sigpath, "rb")) == NULL) { return -1; } - MALLOC(*sig, st.st_size, return -1); - - if((fp = fopen(sigpath, "rb")) == NULL) { - free(*sig); + if(fstat(fileno(fp), &st) != 0 || st.st_size > INT_MAX) { return -1; } + MALLOC(*sig, st.st_size, return -1); + if(fread(*sig, st.st_size, 1, fp) != 1) { free(*sig); fclose(fp); -- 2.8.3

4 7

[pacman-dev] [PATCH] Fix out of boundary reads in pacsort.
by Tobias Stoeckmann 18 Jun '16

18 Jun '16

This patch fixes two out of bound reads in pacsort (as they are of the same error type, I didn't see a reason to split it into two commits). The first one is triggered by a very large "key column" and the delimiter '\0'. The return value of strchr() is not checked for the special case in which it reaches the end of the version string. I recommend to simply not allow the '\0' separator, because file names cannot contain it. And therefore, it cannot be a sane column separator in file names for versions either. You can trigger it by running this command: $ echo -e "-.pkg.tar.xz\n-.pkg.tar.xz" | pacsort -k 999999 -t '\0' Segmentation fault The second one is triggered due to a wrong assumption in fnmatch pattern. It is assumed that "*-*.pkg.tar.?z" will only match file names which contain a dash. But in fact, it also accepts files without one, if at least one of the directories contains it. One example would be "/my-path/file.pkg.tar.xz". While parsing the version string, the return value of strrchr() looking for the dash is not checked anymore. In this case, it would return NULL and further pointer arithmetic on it turns it into SIZE_MAX. Eventually, pacman segfaults while traversing this memory area for needed chars: $ echo "-/.pkg.tar.xz" | pacsort Segmentation fault Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- src/util/pacsort.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 662b250..65f67bd 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -228,6 +228,9 @@ static struct input_t *input_new(const char *path, int pathlen) } pkgver_end = strrchr(in->pkgname, '-'); + if(pkgver_end == NULL || pkgver_end == in->pkgname) { + return in; + } /* read backwards through pkgrel */ for(in->pkgver = pkgver_end - 1; @@ -410,8 +413,6 @@ static char escape_char(const char *string) return '\n'; case 'v': return '\v'; - case '0': - return '\0'; default: return INVALD_ESCAPE_CHAR; } -- 2.8.3

5 8

[pacman-dev] [PATCH] Release resources on error paths.
by Tobias Stoeckmann 13 Jun '16

13 Jun '16

Some resources (memory or file descriptors) are not released on all error paths. Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- Yes it's rather ironic to send this patch after forgetting one on my own just now. ;) --- lib/libalpm/add.c | 5 ++++- lib/libalpm/backup.c | 5 +++-- lib/libalpm/be_local.c | 18 +++++++++++++++--- lib/libalpm/be_package.c | 1 + 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f5c9a95..d132e52 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -466,7 +466,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } } - /* prepare directory for database entries so permission are correct after + /* prepare directory for database entries so permissions are correct after changelog/install script installation */ if(_alpm_local_db_prepare(db, newpkg)) { alpm_logaction(handle, ALPM_CALLER_PREFIX, @@ -503,6 +503,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, _alpm_log(handle, ALPM_LOG_ERROR, _("could not change directory to %s (%s)\n"), handle->root, strerror(errno)); _alpm_archive_read_free(archive); + if(cwdfd >= 0) { + close(cwdfd); + } close(fd); ret = -1; goto cleanup; diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index f622589..50bad5e 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -48,9 +48,10 @@ int _alpm_split_backup(const char *string, alpm_backup_t **backup) ptr++; /* now str points to the filename and ptr points to the hash */ STRDUP((*backup)->name, str, FREE(str); return -1); - STRDUP((*backup)->hash, ptr, FREE(str); return -1); + STRDUP((*backup)->hash, ptr, FREE((*backup)->name); FREE(str); return -1); FREE(str); - return 0;} + return 0; +} /* Look for a filename in a alpm_pkg_t.backup list. If we find it, * then we return the full backup entry. diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index f817822..0b351f9 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -794,7 +794,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) _alpm_strip_newline(line, 0); if(strcmp(line, "%FILES%") == 0) { size_t files_count = 0, files_size = 0, len; - alpm_file_t *files = NULL; + alpm_file_t *files = NULL, *newfiles; while(safe_fgets(line, sizeof(line), fp) && (len = _alpm_strip_newline(line, 0))) { @@ -805,13 +805,18 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) /* since we know the length of the file string already, * we can do malloc + memcpy rather than strdup */ len += 1; - MALLOC(files[files_count].name, len, goto error); + MALLOC(files[files_count].name, len, goto nomem); memcpy(files[files_count].name, line, len); files_count++; } /* attempt to hand back any memory we don't need */ if(files_count > 0) { - files = realloc(files, sizeof(alpm_file_t) * files_count); + newfiles = realloc(files, sizeof(alpm_file_t) * files_count); + if(newfiles == NULL) { + goto nomem; + } + files = newfiles; + /* make sure the list is sorted */ qsort(files, files_count, sizeof(alpm_file_t), _alpm_files_cmp); } else { @@ -819,6 +824,13 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) } info->files.count = files_count; info->files.files = files; + continue; +nomem: + while(files_count > 0) { + FREE(files[--files_count].name); + } + FREE(files); + goto error; } else if(strcmp(line, "%BACKUP%") == 0) { while(safe_fgets(line, sizeof(line), fp) && _alpm_strip_newline(line, 0)) { alpm_backup_t *backup; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index c9ed770..a79c0c5 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -762,6 +762,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful if(fail) { _alpm_log(handle, ALPM_LOG_ERROR, _("required key missing from keyring\n")); + free(sigpath); return -1; } } -- 2.8.3

3 3