aboutsummaryrefslogtreecommitdiffstats
path: root/util-src/encodings.c
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-03 18:39:27 +0200
committerKim Alvefur <zash@zash.se>2015-05-03 18:39:27 +0200
commit009cde88a5518e95481126c547bf0b79f95ac797 (patch)
tree1db58cd52f622c3560457cf589cdc8e6326d28e6 /util-src/encodings.c
parent86867275492107937cea9b5887de077679bc751d (diff)
parenta7606f77d99c798faa7067331e5b9ac0272c5ad1 (diff)
downloadprosody-009cde88a5518e95481126c547bf0b79f95ac797.tar.gz
prosody-009cde88a5518e95481126c547bf0b79f95ac797.zip
Merge 0.10->trunk
Diffstat (limited to 'util-src/encodings.c')
-rw-r--r--util-src/encodings.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/util-src/encodings.c b/util-src/encodings.c
index 2eaad2c8..c00b2267 100644
--- a/util-src/encodings.c
+++ b/util-src/encodings.c
@@ -476,14 +476,15 @@ static int Lidna_to_unicode(lua_State* L) { /** idna.to_unicode(s) */
static int Lidna_to_ascii(lua_State* L) { /** idna.to_ascii(s) */
size_t len;
const char* s = check_utf8(L, 1, &len);
+ char* output = NULL;
+ int ret;
if(s == NULL || len != strlen(s)) {
lua_pushnil(L);
return 1; /* TODO return error message */
}
- char* output = NULL;
- int ret = idna_to_ascii_8z(s, &output, IDNA_USE_STD3_ASCII_RULES);
+ ret = idna_to_ascii_8z(s, &output, IDNA_USE_STD3_ASCII_RULES);
if(ret == IDNA_SUCCESS) {
lua_pushstring(L, output);