diff options
author | daurnimator <quae@daurnimator.com> | 2017-09-03 21:13:09 +1000 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2017-09-03 21:16:31 +1000 |
commit | dbe9317aed79bb65f16e5cb680971760dbe5f6a6 (patch) | |
tree | c1bcba62c19ed0e737fdfcbdcace8fa4c728e80b | |
parent | 40e76e4283e69c13da9cf6cdf4290036e3c247d7 (diff) | |
download | luaossl-dbe9317aed79bb65f16e5cb680971760dbe5f6a6.tar.gz luaossl-dbe9317aed79bb65f16e5cb680971760dbe5f6a6.tar.bz2 luaossl-dbe9317aed79bb65f16e5cb680971760dbe5f6a6.zip |
Don't reset metamethods when reset is 0
Fixes issue where interposed methods were discarded if any more C modules were loaded
Closes #104
-rw-r--r-- | regress/104-interposition-discarded.lua | 12 | ||||
-rw-r--r-- | src/openssl.c | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/regress/104-interposition-discarded.lua b/regress/104-interposition-discarded.lua new file mode 100644 index 0000000..4261bcb --- /dev/null +++ b/regress/104-interposition-discarded.lua | |||
@@ -0,0 +1,12 @@ | |||
1 | #!/usr/bin/env lua | ||
2 | |||
3 | require"regress".export".*" | ||
4 | |||
5 | local ssl_context = require "openssl.ssl.context" | ||
6 | |||
7 | local value = {} | ||
8 | ssl_context.interpose("foo", value) | ||
9 | check(ssl_context.new().foo == value, "interpose failed") | ||
10 | |||
11 | require "openssl.ssl" -- Pick a module that doesn't get loaded by regress.lua | ||
12 | check(ssl_context.new().foo == value, "loading a module reset methods") | ||
diff --git a/src/openssl.c b/src/openssl.c index 5507762..f0d2a38 100644 --- a/src/openssl.c +++ b/src/openssl.c | |||
@@ -1191,6 +1191,9 @@ static _Bool auxL_newclass(lua_State *L, const char *name, const auxL_Reg *metho | |||
1191 | _Bool fresh = auxL_newmetatable(L, name, reset); | 1191 | _Bool fresh = auxL_newmetatable(L, name, reset); |
1192 | int n; | 1192 | int n; |
1193 | 1193 | ||
1194 | if (!reset && !fresh) | ||
1195 | return fresh; | ||
1196 | |||
1194 | auxL_setfuncs(L, metamethods, 0); | 1197 | auxL_setfuncs(L, metamethods, 0); |
1195 | 1198 | ||
1196 | if ((n = auxL_liblen(methods))) { | 1199 | if ((n = auxL_liblen(methods))) { |