Skip to content

V
varnish-cache
Unverified Commit d0a89676 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

VDP/VFP sanity 

* there is no NULL filter
* the filter name cannot be NULL or empty
parent a80d0362
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 0 deletions
bin/varnishd/cache/cache_vrt_filter.c
View file @ d0a89676
...@@ -70,6 +70,10 @@ VRT_AddVFP(VRT_CTX, const struct vfp *filter) ...@@ -70,6 +70,10 @@ VRT_AddVFP(VRT_CTX, const struct vfp *filter)
struct vfilter_head *hd = &vfp_filters; struct vfilter_head *hd = &vfp_filters;
CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
AN(filter);
AN(filter->name);
AN(*filter->name);
VTAILQ_FOREACH(vp, hd, list) { VTAILQ_FOREACH(vp, hd, list) {
xxxassert(vp->vfp != filter); xxxassert(vp->vfp != filter);
xxxassert(strcasecmp(vp->name, filter->name)); xxxassert(strcasecmp(vp->name, filter->name));
...@@ -97,6 +101,10 @@ VRT_AddVDP(VRT_CTX, const struct vdp *filter) ...@@ -97,6 +101,10 @@ VRT_AddVDP(VRT_CTX, const struct vdp *filter)
struct vfilter_head *hd = &vdp_filters; struct vfilter_head *hd = &vdp_filters;
CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
AN(filter);
AN(filter->name);
AN(*filter->name);
VTAILQ_FOREACH(vp, hd, list) { VTAILQ_FOREACH(vp, hd, list) {
xxxassert(vp->vdp != filter); xxxassert(vp->vdp != filter);
xxxassert(strcasecmp(vp->name, filter->name)); xxxassert(strcasecmp(vp->name, filter->name));
...@@ -124,6 +132,10 @@ VRT_RemoveVFP(VRT_CTX, const struct vfp *filter) ...@@ -124,6 +132,10 @@ VRT_RemoveVFP(VRT_CTX, const struct vfp *filter)
struct vfilter_head *hd = &ctx->vcl->vfps; struct vfilter_head *hd = &ctx->vcl->vfps;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
AN(filter);
AN(filter->name);
AN(*filter->name);
ASSERT_CLI(); ASSERT_CLI();
VTAILQ_FOREACH(vp, hd, list) { VTAILQ_FOREACH(vp, hd, list) {
if (vp->vfp == filter) if (vp->vfp == filter)
...@@ -141,6 +153,10 @@ VRT_RemoveVDP(VRT_CTX, const struct vdp *filter) ...@@ -141,6 +153,10 @@ VRT_RemoveVDP(VRT_CTX, const struct vdp *filter)
struct vfilter_head *hd = &ctx->vcl->vdps; struct vfilter_head *hd = &ctx->vcl->vdps;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
AN(filter);
AN(filter->name);
AN(*filter->name);
ASSERT_CLI(); ASSERT_CLI();
VTAILQ_FOREACH(vp, hd, list) { VTAILQ_FOREACH(vp, hd, list) {
if (vp->vdp == filter) if (vp->vdp == filter)
......
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