diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:10:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:10:36 +0100 |
| commit | 1a4378dc767cf399e0f6a77f80fbda44e9c617be (patch) | |
| tree | d3b8e7e2b7958b9d1e50e5c4f851034440a25f9e | |
| parent | f647dddfc8b571ac27de3917c7f38f014e2a2096 (diff) | |
| parent | c7b6a85abba02b66e9c5a202a575b4b88a8a9348 (diff) | |
| download | prosody-1a4378dc767cf399e0f6a77f80fbda44e9c617be.tar.gz prosody-1a4378dc767cf399e0f6a77f80fbda44e9c617be.zip | |
Merge with waqas
| -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 } } |