From 930f0ab0834bc01022e243533c1b414cbaec07f7 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 22 Sep 2009 22:21:15 +0500 Subject: util.encodings: Fixed an issue with cross-module memory deallocation (crashes on some windows versions). --- util-src/encodings.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 } } -- cgit v1.2.3 From c7b6a85abba02b66e9c5a202a575b4b88a8a9348 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 22 Sep 2009 22:31:41 +0500 Subject: Makefile.win: Updated the windows Makefile with more appropriate paths. --- util-src/Makefile.win | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3