Re: [PATCH 3/3] C-only HTTP Unix socket server + PSGI TCP reverse proxy

[Eric Wong <e@80x24.org>]

Eric Wong <e@80x24.org> wrote:
> index 730699a..bed43d6 100644
> --- a/mwrap_core.h
> +++ b/mwrap_core.h

> +/* extract from backtrace_symbols(3) output */
>  static int extract_addr(const char *str, size_t len, void **p)
>  {
> -	const char *c;
> -#if defined(__GLIBC__)
> -	return ((c = memrchr(str, '[', len)) && sscanf(c, "[%p]", p));
> -#else /* TODO: test FreeBSD */
> -	return ((c = strstr(str, "0x")) && sscanf(c, "%p", p));
> +	unsigned long x;
> +	char *e;
> +#if defined(__GLIBC__) /* str = "/path/to/foo.so(+0x123) [0xdeadbeefcafe]" */
> +	const char *end = str + len;
> +	const char *c = memrchr(str, '[', len);
> +	if (c && (c + 2) < end && c[1] == '0' && c[2] == 'x') {
> +		errno = 0;
> +		x = strtoul(c + 3, &e, 16);
> +		if (!errno && *e == ']') {
> +			*p = (void *)x;
> +			return 1;
> +		}
> +	}
> +#elif defined(__FreeBSD__) /* str = "0xdeadbeefcafe <%n%D> at %f" */
> +	const char *c = memchr(str, ' ', len);
> +	errno = 0;
> +	if (len > 4 && c && str[0] == '0' && str[1] == 'x') {
> +		errno = 0;
> +		x = strtoul(str + 3, &e, 16);

Erm, that should be `str + 2' on FreeBSD to skip "0x":

diff --git a/mwrap_core.h b/mwrap_core.h
index bed43d6..b2d0511 100644
--- a/mwrap_core.h
+++ b/mwrap_core.h
@@ -739,7 +739,7 @@ static int extract_addr(const char *str, size_t len, void **p)
 	errno = 0;
 	if (len > 4 && c && str[0] == '0' && str[1] == 'x') {
 		errno = 0;
-		x = strtoul(str + 3, &e, 16);
+		x = strtoul(str + 2, &e, 16);
 		if (!errno && *e == ' ') {
 			*p = (void *)x;
 			return 1;