diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-03 13:57:40 -0300 |
commit | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (patch) | |
tree | 3eeb67878db60db79eb21dc2232377e6b56a3add /extra/libxcb | |
parent | b2e7dca27f9de046feecd59ecfc93cd17bca8356 (diff) | |
parent | b618c3d0693aec564c6746238fd05d94e31d3b76 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/asciijump/PKGBUILD
community/cairo-compmgr/PKGBUILD
community/cwiid/PKGBUILD
community/darcs/PKGBUILD
community/gadmin-samba/PKGBUILD
community/gstm/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-mmap/PKGBUILD
community/lastfm-client/PKGBUILD
community/libtar/PKGBUILD
community/mget/PKGBUILD
community/nexuiz/PKGBUILD
community/pstreams/PKGBUILD
community/pyglet/PKGBUILD
community/python-html5lib/PKGBUILD
community/python-pychm/PKGBUILD
community/qoauth/PKGBUILD
community/quilt/PKGBUILD
community/stormbaancoureur/PKGBUILD
community/winegame/PKGBUILD
community/winestuff/PKGBUILD
community/xdg-user-dirs/PKGBUILD
core/libfetch/PKGBUILD
extra/acpi/PKGBUILD
extra/alex/PKGBUILD
extra/allegro/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/erlang/PKGBUILD
extra/ettercap/PKGBUILD
extra/gftp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/happy/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-fgl/PKGBUILD
extra/haskell-glut/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/haskell-platform/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-stm/PKGBUILD
extra/haskell-syb/PKGBUILD
extra/haskell-xhtml/PKGBUILD
extra/libnet/PKGBUILD
extra/linux_logo/PKGBUILD
extra/mailman/PKGBUILD
extra/midori/PKGBUILD
extra/ntrack/PKGBUILD
extra/pwgen/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/qtcurve-kde4/PKGBUILD
extra/ristretto/PKGBUILD
extra/rxvt-unicode/PKGBUILD
extra/telepathy-sofiasip/PKGBUILD
extra/tightvnc/PKGBUILD
extra/vsftpd/PKGBUILD
extra/windowmaker-crm-git/PKGBUILD
libre/aufs2-libre/PKGBUILD
libre/calibre-libre/PKGBUILD
libre/calibre-libre/calibre-mount-helper
libre/calibre-libre/calibre.install
libre/calibre-libre/desktop_integration.patch
libre/ffmpeg-libre/PKGBUILD
mozilla-testing/iceweasel-libre/PKGBUILD
mozilla-testing/iceweasel-libre/libre.patch
mozilla-testing/iceweasel-libre/mozconfig
~lukeshu/openni-unstable/PKGBUILD
Diffstat (limited to 'extra/libxcb')
-rw-r--r-- | extra/libxcb/xcb_auth-fix-memory-leak.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/extra/libxcb/xcb_auth-fix-memory-leak.patch b/extra/libxcb/xcb_auth-fix-memory-leak.patch deleted file mode 100644 index d1000913a..000000000 --- a/extra/libxcb/xcb_auth-fix-memory-leak.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5755582444ad0ba79e661ab3173cc38e9e588d83 Mon Sep 17 00:00:00 2001 -From: Nick Bowler <nbowler@draconx.ca> -Date: Thu, 11 Nov 2010 01:49:41 +0000 -Subject: xcb_auth: Fix memory leak in _xcb_get_auth_info. - -If the initial get_peer_sock_name(getpeername ...) succeeds, the -pointer to allocated memory is overwritten by the later call to -get_peer_sock_name(getsockname ...). Fix that up by freeing -the allocated memory before overwriting the pointer. - -Signed-off-by: Nick Bowler <nbowler@draconx.ca> -Signed-off-by: Julien Danjou <julien@danjou.info> ---- -diff --git a/src/xcb_auth.c b/src/xcb_auth.c -index 1af27fc..4839b78 100644 ---- a/src/xcb_auth.c -+++ b/src/xcb_auth.c -@@ -327,10 +327,15 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display) - if (!info->namelen) - goto no_auth; /* out of memory */ - -- if (!gotsockname && (sockname = get_peer_sock_name(getsockname, fd)) == NULL) -+ if (!gotsockname) - { -- free(info->name); -- goto no_auth; /* can only authenticate sockets */ -+ free(sockname); -+ -+ if ((sockname = get_peer_sock_name(getsockname, fd)) == NULL) -+ { -+ free(info->name); -+ goto no_auth; /* can only authenticate sockets */ -+ } - } - - ret = compute_auth(info, authptr, sockname); --- -cgit v0.8.3-6-g21f6 |