diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-15 22:05:28 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-15 22:11:14 +0200 |
| commit | c0bd1e49f2d9867f7d3747111423a959123e73ed (patch) | |
| tree | 8c4bbcfa86b2d15b583fc9b6d48122c1a7713ce0 /main/musl | |
| parent | 39171d2dd47e48195dcd013893e4ff7323c5e0fe (diff) | |
| download | aports-c0bd1e49f2d9867f7d3747111423a959123e73ed.tar.bz2 aports-c0bd1e49f2d9867f7d3747111423a959123e73ed.tar.xz | |
main/musl: fix error return code for getaddrinfo
needed for fixing dns tests in nodejs test suite
https://github.com/nodejs/node/pull/5099
Diffstat (limited to 'main/musl')
| -rw-r--r-- | main/musl/0001-check-result-from-res_mkquery.patch | 33 | ||||
| -rw-r--r-- | main/musl/APKBUILD | 6 |
2 files changed, 38 insertions, 1 deletions
diff --git a/main/musl/0001-check-result-from-res_mkquery.patch b/main/musl/0001-check-result-from-res_mkquery.patch new file mode 100644 index 0000000000..384617a9fa --- /dev/null +++ b/main/musl/0001-check-result-from-res_mkquery.patch @@ -0,0 +1,33 @@ +From 9ba48c2e4f1a8a0670ffc40c02ac6a909c62668e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 25 May 2016 09:37:54 +0200 +Subject: [PATCH] check result from res_mkquery + +we don't want to try send a query that may be malformatted. +--- + src/network/lookup_name.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c +index 86f90ac..d3d97b4 100644 +--- a/src/network/lookup_name.c ++++ b/src/network/lookup_name.c +@@ -145,11 +145,15 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static + if (family != AF_INET6) { + qlens[nq] = __res_mkquery(0, name, 1, RR_A, 0, 0, 0, + qbuf[nq], sizeof *qbuf); ++ if (qlens[nq] == -1) ++ return EAI_NONAME; + nq++; + } + if (family != AF_INET) { + qlens[nq] = __res_mkquery(0, name, 1, RR_AAAA, 0, 0, 0, + qbuf[nq], sizeof *qbuf); ++ if (qlens[nq] == -1) ++ return EAI_NONAME; + nq++; + } + +-- +2.8.4 + diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index 8be162449b..9dfde814f5 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=musl pkgver=1.1.14 -pkgrel=9 +pkgrel=10 pkgdesc="the musl c library (libc) implementation" url="http://www.musl-libc.org/" arch="all" @@ -24,6 +24,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz 0010-fix-read-past-end-of-haystack-buffer-for-short-needl.patch 0011-fix-FILE-buffer-underflow-in-ungetwc.patch 0012-fix-incorrect-protocol-name-and-number-for-egp.patch + 0001-check-result-from-res_mkquery.patch ldconfig __stack_chk_fail_local.c @@ -143,6 +144,7 @@ a2457ce90f3e4d5ef04005b6f42e9bc3 0009-fix-regression-disabling-use-of-pause-ins 5cbd4551e71b317e1125e9cbe08e9a6d 0010-fix-read-past-end-of-haystack-buffer-for-short-needl.patch 1a54c766a86a56946ee53f9515410670 0011-fix-FILE-buffer-underflow-in-ungetwc.patch 67ca785b787c53316397f96d21afab31 0012-fix-incorrect-protocol-name-and-number-for-egp.patch +3e78b4c125b0c3f06c06a9b4ade8e18d 0001-check-result-from-res_mkquery.patch 830d01f7821b978df770b06db3790921 ldconfig 0df687757221bbb0fc1aa67f1bd646f9 __stack_chk_fail_local.c 57ef2c63b9ec6a2041694ace97d4ffa2 getconf.c @@ -161,6 +163,7 @@ b937311664b96b6272e4e62e1aa0d44edd58c825cbb95746c82fab85a6390968 0008-fix-undef 3cfd4b886b5aa99d48a4bc814e3ac11690fdd166a9fc02da13274cd9acb2260b 0010-fix-read-past-end-of-haystack-buffer-for-short-needl.patch b19de98d4c4051c2ff89b5f4b2705444f6f4c44a639692bedfa30a71b965fd04 0011-fix-FILE-buffer-underflow-in-ungetwc.patch 8721a088af8aa388c771174eb8e9b19cc96c47fe07d2fa8c70a640cdb7d52221 0012-fix-incorrect-protocol-name-and-number-for-egp.patch +7e5b08404da6f306ab8da9e81107a7901415d612069103d6f7b6b8e6ea504959 0001-check-result-from-res_mkquery.patch b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7 ldconfig 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da __stack_chk_fail_local.c d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c getconf.c @@ -179,6 +182,7 @@ afa17d63f3de02661709d3712d1586b3173518476d314ca2b1e72a3814536538c81aefa5a4ec0cee c0cf860bc7c6259dc626a1178258010e4ea6588f1ecd6c6c69ed85f11c5f0f6c502f59af3d9655bb92f05263ffd06c8fe4aed3939e105c00f783b9c7975ac9ff 0010-fix-read-past-end-of-haystack-buffer-for-short-needl.patch 93a696ef060f4a7c9efe32589e3f8e0bb08cbbae6d0f9852aef8555f2f095f0d50431f55647ee8b59599916b0c90bb4aa251be495d3d2697b36c7cad5c9375a4 0011-fix-FILE-buffer-underflow-in-ungetwc.patch 78f1952b786cd4c31d956e169a6362d0f3007d68cb95308f88ae556dac88689cfa0e94856e5e8f727b1f27a9df5b35dab0fec8f3df4d925207c4980eb4e9f80f 0012-fix-incorrect-protocol-name-and-number-for-egp.patch +d1e393976546216a6de28b00a5b405a14d2cdf71945b695c3b45cd636f213ad037108f42301f21f213dbdac4dbce977813aea62cf9cee9f74432e1475e11ce22 0001-check-result-from-res_mkquery.patch 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c |