diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:26:51 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:26:51 +0100 |
| commit | adca883cc39dee260fa778406a16e42169929157 (patch) | |
| tree | 6ee31eed4313315570c0313efa6fc664e02c3aea /util-src | |
| parent | 23d676ee18f898b0db00358a1679bf8e56ef043b (diff) | |
| parent | 0adb8201b5befee459eed2c0388d3c035a831ca1 (diff) | |
| download | prosody-adca883cc39dee260fa778406a16e42169929157.tar.gz prosody-adca883cc39dee260fa778406a16e42169929157.zip | |
Merge with 0.5
Diffstat (limited to 'util-src')
| -rw-r--r-- | util-src/Makefile.win | 4 | ||||
| -rw-r--r-- | util-src/encodings.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/util-src/Makefile.win b/util-src/Makefile.win index d76aaccb..00b3f6fc 100644 --- a/util-src/Makefile.win +++ b/util-src/Makefile.win @@ -1,7 +1,7 @@ LUA_PATH=$(LUA_DEV) -IDN_PATH=.\libidn-1.9 -OPENSSL_PATH=.\openssl-0.9.8i +IDN_PATH=..\..\libidn-1.15 +OPENSSL_PATH=..\..\openssl-0.9.8k LUA_INCLUDE=$(LUA_PATH)\include LUA_LIB=$(LUA_PATH)\lib\lua5.1.lib diff --git a/util-src/encodings.c b/util-src/encodings.c index d7aabc14..65d7d501 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -172,11 +172,11 @@ static int Lidna_to_ascii(lua_State *L) /** idna.to_ascii(s) */ int ret = idna_to_ascii_8z(s, &output, 0); if (ret == IDNA_SUCCESS) { lua_pushstring(L, output); - if (output) free(output); + idn_free(output); return 1; } else { lua_pushnil(L); - if (output) free(output); + idn_free(output); return 1; // TODO return error message } } @@ -189,11 +189,11 @@ static int Lidna_to_unicode(lua_State *L) /** idna.to_unicode(s) */ int ret = idna_to_unicode_8z8z(s, &output, 0); if (ret == IDNA_SUCCESS) { lua_pushstring(L, output); - if (output) free(output); + idn_free(output); return 1; } else { lua_pushnil(L); - if (output) free(output); + idn_free(output); return 1; // TODO return error message } } |