Skip to content

V
varnish-cache
Commit 5103801f authored by Tollef Fog Heen's avatar Tollef Fog Heen Committed by Tollef Fog Heen
Browse files
Options

Use memchr rather than strchr/index 

the strings we get from the libvarnishapi functions are not
necessarily null-terminated, so avoid using str* functions on them.

Thanks to lampe for the patch.

Fixes #1115
parent 7dddf1b7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
bin/varnishncsa/varnishncsa.c
View file @ 5103801f
......@@ -316,7 +316,7 @@ collect_backend(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
clean_logline(lp);
break;
}
qs = index(ptr, '?');
qs = memchr(ptr, '?', len);
if (qs) {
trimline(&lp->df_U, ptr, qs);
trimline(&lp->df_q, qs, end);
......@@ -360,7 +360,7 @@ collect_backend(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
case SLT_TxHeader:
if (!lp->active)
break;
split = strchr(ptr, ':');
split = memchr(ptr, ':', len);
if (split == NULL)
break;
if (isprefix(ptr, "authorization:", end, &next) &&
......@@ -435,7 +435,7 @@ collect_client(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
clean_logline(lp);
break;
}
qs = index(ptr, '?');
qs = memchr(ptr, '?', len);
if (qs) {
trimline(&lp->df_U, ptr, qs);
trimline(&lp->df_q, qs, end);
......@@ -468,7 +468,7 @@ collect_client(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
case SLT_RxHeader:
if (!lp->active)
break;
split = strchr(ptr, ':');
split = memchr(ptr, ':', len);
if (split == NULL)
break;
if (tag == SLT_RxHeader &&
......@@ -493,7 +493,7 @@ collect_client(struct logline *lp, enum VSL_tag_e tag, unsigned spec,
if(!lp->active)
break;
split = strchr(ptr, ':');
split = memchr(ptr, ':', len);
if (split == NULL)
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment