projects
/
haproxy-2.5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e96993b
)
BUG/MINOR: lua: Fix a possible null pointer deref on lua ctx
author
Christopher Faulet
<cfaulet@haproxy.com>
Thu, 30 Jul 2020 08:40:58 +0000
(10:40 +0200)
committer
Christopher Faulet
<cfaulet@haproxy.com>
Thu, 30 Jul 2020 08:40:59 +0000
(10:40 +0200)
This bug was introduced by the commit
8f587ea3
("MEDIUM: lua: Set the analyse
expiration date with smaller wake_time only"). At the end of hlua_action(), the
lua context may be null if the alloc failed.
No backport needed, this is 2.3-dev.
src/hlua.c
patch
|
blob
|
history
diff --git
a/src/hlua.c
b/src/hlua.c
index
a3726ca
..
844a5ec
100644
(file)
--- a/
src/hlua.c
+++ b/
src/hlua.c
@@
-6706,7
+6706,7
@@
static enum act_return hlua_action(struct act_rule *rule, struct proxy *px,
}
end:
- if (act_ret != ACT_RET_YIELD)
+ if (act_ret != ACT_RET_YIELD && s->hlua)
s->hlua->wake_time = TICK_ETERNITY;
return act_ret;
}