musl: update to 1.1.16.
This commit is contained in:
parent
4388d5fc29
commit
2c74146f75
2 changed files with 3 additions and 71 deletions
|
@ -1,68 +0,0 @@
|
||||||
From c3edc06d1e1360f3570db9155d6b318ae0d0f0f7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rich Felker <dalias@aerifal.cx>
|
|
||||||
Date: Thu, 06 Oct 2016 22:34:58 +0000
|
|
||||||
Subject: fix missing integer overflow checks in regexec buffer size computations
|
|
||||||
|
|
||||||
most of the possible overflows were already ruled out in practice by
|
|
||||||
regcomp having already succeeded performing larger allocations.
|
|
||||||
however at least the num_states*num_tags multiplication can clearly
|
|
||||||
overflow in practice. for safety, check them all, and use the proper
|
|
||||||
type, size_t, rather than int.
|
|
||||||
|
|
||||||
also improve comments, use calloc in place of malloc+memset, and
|
|
||||||
remove bogus casts.
|
|
||||||
---
|
|
||||||
diff --git src/regex/regexec.c src/regex/regexec.c
|
|
||||||
index 16c5d0a..dd52319 100644
|
|
||||||
--- src/regex/regexec.c
|
|
||||||
+++ src/regex/regexec.c
|
|
||||||
@@ -34,6 +34,7 @@
|
|
||||||
#include <wchar.h>
|
|
||||||
#include <wctype.h>
|
|
||||||
#include <limits.h>
|
|
||||||
+#include <stdint.h>
|
|
||||||
|
|
||||||
#include <regex.h>
|
|
||||||
|
|
||||||
@@ -206,11 +207,24 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
|
|
||||||
|
|
||||||
/* Allocate memory for temporary data required for matching. This needs to
|
|
||||||
be done for every matching operation to be thread safe. This allocates
|
|
||||||
- everything in a single large block from the stack frame using alloca()
|
|
||||||
- or with malloc() if alloca is unavailable. */
|
|
||||||
+ everything in a single large block with calloc(). */
|
|
||||||
{
|
|
||||||
- int tbytes, rbytes, pbytes, xbytes, total_bytes;
|
|
||||||
+ size_t tbytes, rbytes, pbytes, xbytes, total_bytes;
|
|
||||||
char *tmp_buf;
|
|
||||||
+
|
|
||||||
+ /* Ensure that tbytes and xbytes*num_states cannot overflow, and that
|
|
||||||
+ * they don't contribute more than 1/8 of SIZE_MAX to total_bytes. */
|
|
||||||
+ if (num_tags > SIZE_MAX/(8 * sizeof(int) * tnfa->num_states))
|
|
||||||
+ goto error_exit;
|
|
||||||
+
|
|
||||||
+ /* Likewise check rbytes. */
|
|
||||||
+ if (tnfa->num_states+1 > SIZE_MAX/(8 * sizeof(*reach_next)))
|
|
||||||
+ goto error_exit;
|
|
||||||
+
|
|
||||||
+ /* Likewise check pbytes. */
|
|
||||||
+ if (tnfa->num_states > SIZE_MAX/(8 * sizeof(*reach_pos)))
|
|
||||||
+ goto error_exit;
|
|
||||||
+
|
|
||||||
/* Compute the length of the block we need. */
|
|
||||||
tbytes = sizeof(*tmp_tags) * num_tags;
|
|
||||||
rbytes = sizeof(*reach_next) * (tnfa->num_states + 1);
|
|
||||||
@@ -221,10 +235,9 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
|
|
||||||
+ (rbytes + xbytes * tnfa->num_states) * 2 + tbytes + pbytes;
|
|
||||||
|
|
||||||
/* Allocate the memory. */
|
|
||||||
- buf = xmalloc((unsigned)total_bytes);
|
|
||||||
+ buf = calloc(total_bytes, 1);
|
|
||||||
if (buf == NULL)
|
|
||||||
return REG_ESPACE;
|
|
||||||
- memset(buf, 0, (size_t)total_bytes);
|
|
||||||
|
|
||||||
/* Get the various pointers within tmp_buf (properly aligned). */
|
|
||||||
tmp_tags = (void *)buf;
|
|
||||||
--
|
|
||||||
cgit v0.9.0.3-65-g4555
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'musl'.
|
# Template file for 'musl'.
|
||||||
pkgname=musl
|
pkgname=musl
|
||||||
version=1.1.15
|
version=1.1.16
|
||||||
revision=3
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--prefix=/usr --disable-gcc-wrapper"
|
configure_args="--prefix=/usr --disable-gcc-wrapper"
|
||||||
conflicts="glibc>=0"
|
conflicts="glibc>=0"
|
||||||
|
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
homepage="http://www.musl-libc.org/"
|
homepage="http://www.musl-libc.org/"
|
||||||
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
|
distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
|
||||||
checksum=97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa
|
checksum=937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011
|
||||||
|
|
||||||
nostrip_files="libc.so"
|
nostrip_files="libc.so"
|
||||||
shlib_provides="libc.so"
|
shlib_provides="libc.so"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue