diff options
| -rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb (renamed from meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb) | 3 |
2 files changed, 1 insertions, 23 deletions
diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch deleted file mode 100644 index 4d08651be1..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | fix memory leak in ares_uri (#1012) | ||
| 2 | Dynamic memory, referenced by 'outpath', is allocated at ares_uri.c:527 | ||
| 3 | by calling function 'ares_buf_create' and lost at ares_uri.c:536. | ||
| 4 | |||
| 5 | Signed-off-by: Felix The Cat (@F3lixTheCat) | ||
| 6 | |||
| 7 | -- | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/c-ares/c-ares/commit/ee2a1c3eff3c8164b09123005f4b49c571788b59] | ||
| 10 | |||
| 11 | --- a/src/lib/util/ares_uri.c 2025-08-10 15:59:17.501710307 -0400 | ||
| 12 | +++ b/src/lib/util/ares_uri.c 2025-08-10 16:00:35.867494819 -0400 | ||
| 13 | @@ -533,7 +533,7 @@ | ||
| 14 | status = ares_buf_split_str_array(inpath, (const unsigned char *)"/", 1, | ||
| 15 | ARES_BUF_SPLIT_TRIM, 0, &arr); | ||
| 16 | if (status != ARES_SUCCESS) { | ||
| 17 | - return NULL; | ||
| 18 | + goto done; | ||
| 19 | } | ||
| 20 | |||
| 21 | for (i = 0; i < (ares_ssize_t)ares_array_len(arr); i++) { | ||
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb index b434886311..c9c54a9fa0 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb | |||
| @@ -6,9 +6,8 @@ LICENSE = "MIT" | |||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ | 8 | SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ |
| 9 | file://0001-ares_uri-memory-leak.patch \ | ||
| 10 | file://run-ptest" | 9 | file://run-ptest" |
| 11 | SRC_URI[sha256sum] = "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346" | 10 | SRC_URI[sha256sum] = "912dd7cc3b3e8a79c52fd7fb9c0f4ecf0aaa73e45efda880266a2d6e26b84ef5" |
| 12 | 11 | ||
| 13 | PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 12 | PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
| 14 | PACKAGECONFIG[manpages] = "" | 13 | PACKAGECONFIG[manpages] = "" |
