Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
c0a4ee41
Commit
c0a4ee41
authored
Aug 28, 2018
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
in vmod destructors, tolerate failed object initializations
works around #2297
parent
43b98104
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
0 deletions
+22
-0
fall_back.c
lib/libvmod_directors/fall_back.c
+4
-0
hash.c
lib/libvmod_directors/hash.c
+4
-0
random.c
lib/libvmod_directors/random.c
+4
-0
round_robin.c
lib/libvmod_directors/round_robin.c
+4
-0
vmod_shard.c
lib/libvmod_directors/vmod_shard.c
+6
-0
No files found.
lib/libvmod_directors/fall_back.c
View file @
c0a4ee41
...
...
@@ -124,6 +124,10 @@ vmod_fallback__fini(struct vmod_directors_fallback **fbp)
{
struct
vmod_directors_fallback
*
fb
;
// XXX 2297
if
(
*
fbp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
fb
,
fbp
,
VMOD_DIRECTORS_FALLBACK_MAGIC
);
VRT_DelDirector
(
&
fb
->
vd
->
dir
);
}
...
...
lib/libvmod_directors/hash.c
View file @
c0a4ee41
...
...
@@ -83,6 +83,10 @@ vmod_hash__fini(struct vmod_directors_hash **rrp)
{
struct
vmod_directors_hash
*
rr
;
// XXX 2297
if
(
*
rrp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
rr
,
rrp
,
VMOD_DIRECTORS_HASH_MAGIC
);
VRT_DelDirector
(
&
rr
->
vd
->
dir
);
}
...
...
lib/libvmod_directors/random.c
View file @
c0a4ee41
...
...
@@ -111,6 +111,10 @@ vmod_random__fini(struct vmod_directors_random **rrp)
{
struct
vmod_directors_random
*
rr
;
// XXX 2297
if
(
*
rrp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
rr
,
rrp
,
VMOD_DIRECTORS_RANDOM_MAGIC
);
VRT_DelDirector
(
&
rr
->
vd
->
dir
);
}
...
...
lib/libvmod_directors/round_robin.c
View file @
c0a4ee41
...
...
@@ -119,6 +119,10 @@ vmod_round_robin__fini(struct vmod_directors_round_robin **rrp)
{
struct
vmod_directors_round_robin
*
rr
;
// XXX 2297
if
(
*
rrp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
rr
,
rrp
,
VMOD_DIRECTORS_ROUND_ROBIN_MAGIC
);
VRT_DelDirector
(
&
rr
->
vd
->
dir
);
}
...
...
lib/libvmod_directors/vmod_shard.c
View file @
c0a4ee41
...
...
@@ -270,6 +270,10 @@ vmod_shard__fini(struct vmod_directors_shard **vshardp)
{
struct
vmod_directors_shard
*
vshard
;
// XXX 2297
if
(
*
vshardp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
vshard
,
vshardp
,
VMOD_SHARD_SHARD_MAGIC
);
VRT_DelDirector
(
&
vshard
->
dir
);
FREE_OBJ
(
vshard
);
...
...
@@ -785,8 +789,10 @@ vmod_shard_param__fini(struct vmod_directors_shard_param **pp)
{
struct
vmod_directors_shard_param
*
p
;
// XXX 2297
if
(
*
pp
==
NULL
)
return
;
TAKE_OBJ_NOTNULL
(
p
,
pp
,
VMOD_SHARD_SHARD_PARAM_MAGIC
);
FREE_OBJ
(
p
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment