Fix null pointer ref, bug #456842

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 54 insertions, 18 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 53036ade27a2..45773b1fdaef 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.257 2013/02/09 17:35:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.258 2013/02/12 13:56:30 blueness Exp $
+
+*curl-7.29.0-r1 (12 Feb 2013)
+
+  12 Feb 2013; Anthony G. Basile <blueness@gentoo.org> +curl-7.29.0-r1.ebuild,
+  +files/curl-7.29.0-fix-null-pointer.patch, -curl-7.29.0.ebuild:
+  Fix null pointer ref, bug #456842
 
   09 Feb 2013; Anthony G. Basile <blueness@gentoo.org> curl-7.29.0.ebuild:
   Remove USE=nonblocking, bug #456320
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 54d86976d936..9c39d5c68551 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,6 +10,7 @@ AUX curl-7.27.0-fix-nettle-include.patch 718 SHA256 7630b255984142caf26985a42726
 AUX curl-7.27.0-prefix.patch 842 SHA256 c0ba42416ac1f75bd63c180494c0510dc4ab47d8501fcbd77e75ebe6b136bd19 SHA512 60fef029c8ae9a9458bfee6b19ae7d9dae6317f26e0f1df78e9be83a78e9a81175db77efd1c22f5c09fa5b7b581a76b74457b1e3176f9d42d111f7cd00146244 WHIRLPOOL 5de6922f59e6c16c0abc7d66f361b9c344261172a0388fc6a3090bbb7caa11b8cfdcfe23c83bf6b17d7836dd516c59401302caf504fb3fa4beaa72fb62eed373
 AUX curl-7.28.0-fix-http-auth.patch 744 SHA256 dbd2f399e2425aaae51d05a7c9ca3af2649c7e901245fbc5f9483ac3038a56bb SHA512 16a3f5627782c2ab4b2e721a9346f2e10cd86c6cdf6b9e765d627b5e9f6a056ee72c34531bfd1e3e6d45fc5b0a0d535a475ecadacce58002881c934b77cd35d4 WHIRLPOOL 0a8ef5811e020ddf5697d6537fcfc48b3cf62cde6d4daedb8a67d64a4b1be5608ddd0e36b6488ff5c94159b836da461e29636b121fc4a8008e1edc7a82278eb3
 AUX curl-7.28.0-prefix.patch 845 SHA256 eaff1dd29bb735b1f18362db055be73789d9ad972316f4c21a2949f2ef02a6b3 SHA512 b2e6d87a18866544d4e94bc9f646f59bd36d549b686614c31c6021dac3f987ec804908055d5664011bf379b64fd47c9e780b8b27046f27ae5839ec4a6f180430 WHIRLPOOL c3c2ed9d958c05359c7632aa8db4d5452ab830fa0b634c169ad2c54be04cc171f318ac3986496b474988c2c87166da40c8627086e13affc4b7fd4780aeb3ee0c
+AUX curl-7.29.0-fix-null-pointer.patch 949 SHA256 817acd0a372aa4486696d3bcb93a28e228397ff446a49cf78da7c5b5042d36b9 SHA512 166c4377bce4ab9c8f951f258c3116aa86839397d89bd9ec9cbaf052552a311033402246f80f17f1c479754ce57943feb03b689533dbba3bc3aa3e6488365e9a WHIRLPOOL b43386731d1e7623bd15b65b49add43bd7f6e351c1603575701dfe4c85c5f1d811bbfe5103c88d621300dac407be51ccb1bc519ab325d8b42e4ca5183f9f448d
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 AUX curl-respect-cflags.patch 8180 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665 SHA512 d7af93548e06b71af1295b44b0f32f510ab0833a38276f070da8a1a39f9aca6b8ef755faf62c90303a7680203f0cbc9b1796461b498202eeb2e2912110dc7b71 WHIRLPOOL c1d40e8252c6935ce5872981e987fd8953b71d631f2f6865748ab4a0a456014a9e4e9d29bad942753810d82211e886d1232f12f3e88b7478a602dfe5404eff41
@@ -26,23 +27,23 @@ EBUILD curl-7.26.0.ebuild 6086 SHA256 785de5565ed98c5e46bb1d526936047c6b44fe087a
 EBUILD curl-7.27.0-r3.ebuild 6673 SHA256 8c128a88cf70fda345382dce35b9be5dc875844a769f02a6aae5b6e5c6d48183 SHA512 05c5e3bc00b16f67308ab5d12ecbba2099aacd54e2082761a85be48d496086a823dd0baa1002bc86209245e0254498428bff5a1adfd0c968bf3814f247840567 WHIRLPOOL af58b98be7d569de2a6a325718c60a2b6499acc2ce2af4dc631bd5bdbef788807aef1c731c4246df4452dbd12f2d8d54cd99747804d9f676de750aaca40490ca
 EBUILD curl-7.28.0-r1.ebuild 6572 SHA256 988c8912a7de9952ba8c7c70017f5fa3949740c2fb969362c4cebf1bd8fff147 SHA512 eb87d0865af37df4bcb4317c333996ee27303e0f12fc64fdeecda070b88356cc138c4a522ad765b02c720695c2a047fdc5cde6d1001528c9ae524b72cb47bb6c WHIRLPOOL 9c65b5f177e44195b2bec7213ccc185034209c3c1385d44672bba15cb96ce4da51aaa2b3fa02d248d7b45be357ca43a1de183e5f4c815bbf4caa91f3b2f0c214
 EBUILD curl-7.28.1.ebuild 6447 SHA256 4b81b2a5b334feebfca12c0eb401c0c9f0d3e9acea75a1f937949b34c15c6216 SHA512 2735968447b375a348733fe64b7895e0d2c696aba723c0337e71e269bdebe2ae7e5a2464c31a776549c003db3f95504d328fb2c7fd15cff68adbfed862ef72ef WHIRLPOOL 49adafc7e01393c2d5d8f9f84d345fb26e2a9051e2d27f99a526d5b9f766f90cdef2dfbe45675a3dc4277cfc420400d61a43e3339762991c5379744e6667b944
-EBUILD curl-7.29.0.ebuild 6404 SHA256 dd7048e666e8579156d8c3704fded9137d12877d36c469bbb292c9e1a364be6d SHA512 0998537b3c0ef62f623bb65261a7d6fd34b58fee0262c1d799ad2d10d907d997388251abf7a576ced15c779ec585714e9ad8aa99ea47fd168b72657d487f3a94 WHIRLPOOL 1e112e7bf154fae00bdeb029d25eb4fc5bc317daa957b5f9aec57aa7f987f1a2aed11a440b6781f1d483c102b1ab8f9af860bb84b117b7e2e2e279fc600cbf34
-MISC ChangeLog 41563 SHA256 eb3c4fdcfcc512af960ce3312d4c4154273a96ac926a0e8f0051b55a62eb7779 SHA512 988e35cb7065e972ba94c5a65e97c10bd4111bca929590005fb9a924a2abe5f09a2f825c68a144f2b849b25b2241f9f605285c821349f3793e93b8b9c8f08b06 WHIRLPOOL 8928cf29d9eed6307fd105ee9a67fd17c7b455ffd3e026a11fc19aedb529a412d5916b8ac45b50cab0e4a145a3943a54d54ccbd8f58e5c7a435418f725524174
+EBUILD curl-7.29.0-r1.ebuild 6461 SHA256 37bef0a951df804fbde20bb9bc4de0d069058dad2f9d1df469942f1c439dda18 SHA512 a13a2a0a58ebc86c77760c6e40f2284d7af4bfbc97f426584b6a35510594570a8f6b137244d3fd0bd9f8faaa72dea32398366691d6a8e3fb8b52f6531fc0ddb0 WHIRLPOOL 00b098e27f42a5ce44b7500777181b70f815c83ad88203955a71f4a4785bb8574ba4d2492f47b14c5280a5d0f6944a5e20f3f391da32d00e4388117c5dbb888e
+MISC ChangeLog 41776 SHA256 54df9019966e6fc445f2032ace1ac69ff128972a3fc6f92da3bc5d59179726e2 SHA512 68cae52147ea4ce35439384b9c175e0cacf77ed8b930a5c960be0d2b6e9149ae01657774097078eb6e431fb749f12baac6282d06c81d756977a97f4a8732ccb4 WHIRLPOOL 99d780e5bccee990df3639b87e1fd34f3acc33ac891907f65cb00089b892926055248493027125e6b8a208a4a30f8e2a244d3934fb395ba1c24e257988deee56
 MISC metadata.xml 914 SHA256 5ef1a7aa505389d5251c676a19babf3da6cd327391a731c51142d98c6a592f5f SHA512 1a8dbd0b7ae28fb8a91c566ff1766d166c188c382f050a2738551ca691305154cf387464df4090aeb2b3b7c38cf54895754407e6865adf88ebd030429a9a55f3 WHIRLPOOL 376247a5eeaa313864f6abe1860976a3bdac08f438c9eac8a92ebb58811f1bf3893023314cf931023a96db093c49edf9a972ca367b118c9d7d5f006bf7c5912d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFoj6AAoJEJOE+m71LUu62okP/Ayx9C7MKS4/J97Fhy22wfHp
-bLQXUj9sc9d1b9BFAzxU1EnZgMB+QQA0bmqEftPoX8r7gJGlSenSAyuDlbwDh8rh
-Dy5OfpY4JHvfYzHU+fQ5QfTbtEopoZz5u0ml/4grNu3q+yGOz6nNLoGxmg01nYsh
-pIDcQnoWLenIIg1rnJC9Qhr+/wVQq5AykX2pdng/nrYT9ZkScysR3Ua2eK8rBNCR
-3edyfbcB4z+0FinhIejo2fZvXoaJKjOg8DiPzJl9sxNbuV2z6N5IHGCoOPQfXbN2
-kVSIRkuS+sGxPnbJP1oOQTeLry4dI5kZH3WN2TEVH03Io2bDqcX2KZ9Roy1U+AjT
-LRJM92MrtkiL5OMkgTkQkmgCqSRz5ynz2RMBjNRfiEsYHIvdnZpJQpHldOMwcOVy
-skeOgjso3RfQIU+ehW9Q8IMWUOhuiKaDhy48RXRzRIhCU4BhDK1m/hSsoNUGn0N4
-Xfw2qeyefb/P7In9y/xPd+ZijlI79NiRd8b8YdwGoZrxe9GGCTbt5l70LAhhycCM
-Yz0lYs3ZM6ZaiS9JuFOHja1Mxso92pPcRMstVF0jbaMMMZyjSJKC4Vbp6JLqOJ1S
-BknIiZXrLJa0IoHdBnDnziO+/DJGNP37D7PY1z2rdnJbPkPTcqdT0aRXrWRU0k61
-hhYhU4uYKLWlnPqL7Cun
-=SMVZ
+iQIcBAEBCAAGBQJRGkoMAAoJEJOE+m71LUu6vxkP/1cIEOG252jvxNpRnhRh49AW
+ZcVh3zApKWglCLf14tKmQr5rS1+e+7GCzSg5WAxYOdpM0RJ0c7P+ajdufng3kDai
+5bkENEJZCn51O8+Jg9irwqlxow3CVBp0B1a4a1ddqjRPuPFZxp2ZTs5K4SB71KuH
+FzBIyTYXJnULPcW3HOmLFKe67fOUGfNMDhjMf7MQ2Mhrwi3fF0t2sMFPQBE5HD50
+oI62Cf8FIMaAYWaEvJ4lke+W+uW7eIbltQvrNbNjXjoZHME62rq+LAedjHZiL0kO
+VL2c9oHLGBlnbUk5dEcHO69pyuaofX9D3QLZn4AXX5geJPAR5XBQzoqw9wZREnOg
+FboLzgqiiZwG0FmLxxHvPkJ/ZByK6WaJ8Lz/8aVKZOdsO7NswjGEZdJ0N/qoliW3
+Dw8qIVTVajvAIqjG9NC4wFklpqfYB/UTa1++EnkGRLmWCu2zyUMfK4T6iy4dKAX7
+FAjzJKJ9+xTV7mIaS8Q1UxjkDUeOc1ZSv2PnJ6RSN0A0NMEqYxc2DGJ17TNs+QB4
+mFX8Q3Rku926p7oqgyVwGxARM6mro1XwwhHt7i30E09Pvo70+9dd1Uejfp2v5Fh9
+eYrjTdr4uxwIEu6iIKW4fzaZe5O05Lkj8C4qC1wbjyPg+kqHzTt/UOC3w1EsKoHn
+1wTHntrD+4+k4bguo1bS
+=T6OW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.29.0.ebuild b/net-misc/curl/curl-7.29.0-r1.ebuild
index ad810f85110d..647894b95637 100644
--- a/net-misc/curl/curl-7.29.0.ebuild
+++ b/net-misc/curl/curl-7.29.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.29.0.ebuild,v 1.2 2013/02/09 17:35:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.29.0-r1.ebuild,v 1.1 2013/02/12 13:56:30 blueness Exp $
 
 EAPI="4"
 
@@ -85,7 +85,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-7.28.0-prefix.patch \
 		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
-		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
+		"${FILESDIR}"/${PN}-7.29.0-fix-null-pointer.patch
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 
 	eprefixify curl-config.in
diff --git a/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch b/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
new file mode 100644
index 000000000000..3a20c8ab19b2
--- /dev/null
+++ b/net-misc/curl/files/curl-7.29.0-fix-null-pointer.patch
@@ -0,0 +1,28 @@
+Fix NULL pointer reference when closing an unused multi handle.
+
+This is commit da3fc1e from upstream, modulo test 1508.
+
+X-Gentoo-Bug: 456842
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/456842
+Reported-by: Thomas McShane <firewrks@yahoo.com>
+
+diff --git a/lib/multi.c b/lib/multi.c
+index fa0afb9..706df23 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
+     /* Close all the connections in the connection cache */
+     close_all_connections(multi);
+ 
+-    multi->closure_handle->dns.hostcache = multi->hostcache;
+-    Curl_hostcache_clean(multi->closure_handle);
++    if(multi->closure_handle) {
++      multi->closure_handle->dns.hostcache = multi->hostcache;
++      Curl_hostcache_clean(multi->closure_handle);
+ 
+-    Curl_close(multi->closure_handle);
++      Curl_close(multi->closure_handle);
++    }
+     multi->closure_handle = NULL;
+ 
+     Curl_hash_destroy(multi->sockhash);